am 9137fcaa: Merge "Remove isDither(), deprecate setDither()" into mnc-dev (c7201180) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −2

api/system-current.txt

+1 −2

graphics/java/android/graphics/drawable/BitmapDrawable.java

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -362,11 +362,6 @@ public class BitmapDrawable extends Drawable {
	invalidateSelf();		invalidateSelf();
	}		}

	@Override
	public boolean isDither() {
	return mBitmapState.mPaint.isDither();
	}

	/**		/**
	* Indicates the repeat behavior of this drawable on the X axis.		* Indicates the repeat behavior of this drawable on the X axis.
	*		*

graphics/java/android/graphics/drawable/Drawable.java

+4 −14

Original line number	Original line	Diff line number	Diff line
	@@ -269,25 +269,15 @@ public abstract class Drawable {
	}		}

	/**		/**
	* Set to true to have the drawable dither its colors when drawn to a device		* Set to true to have the drawable dither its colors when drawn to a
	* with fewer than 8-bits per color component.		* device with fewer than 8-bits per color component.
	*		*
	* <p>This can improve the look on those devices, but can also slow down
	* the drawing a little.</p>
	*
	* @see #isDither()
	* @see android.graphics.Paint#setDither(boolean);		* @see android.graphics.Paint#setDither(boolean);
			* @deprecated This property is ignored.
	*/		*/
			@Deprecated
	public void setDither(boolean dither) {}		public void setDither(boolean dither) {}

	/**
	* @return whether this drawable dithers its colors
	* @see #setDither(boolean)
	*/
	public boolean isDither() {
	return false;
	}

	/**		/**
	* Set to true to have the drawable filter its bitmaps with bilinear		* Set to true to have the drawable filter its bitmaps with bilinear
	* sampling when they are scaled or rotated.		* sampling when they are scaled or rotated.

graphics/java/android/graphics/drawable/DrawableContainer.java

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -166,11 +166,6 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
	}		}
	}		}

	@Override
	public boolean isDither() {
	return mDrawableContainerState.mDither;
	}

	@Override		@Override
	public void setColorFilter(ColorFilter colorFilter) {		public void setColorFilter(ColorFilter colorFilter) {
	mDrawableContainerState.mHasColorFilter = true;		mDrawableContainerState.mHasColorFilter = true;

Original line number	Original line	Diff line number	Diff line
	@@ -12301,7 +12301,6 @@ package android.graphics.drawable {
	method public void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet, android.content.res.Resources.Theme) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;		method public void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet, android.content.res.Resources.Theme) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
	method public void invalidateSelf();		method public void invalidateSelf();
	method public boolean isAutoMirrored();		method public boolean isAutoMirrored();
	method public boolean isDither();
	method public boolean isFilterBitmap();		method public boolean isFilterBitmap();
	method public boolean isStateful();		method public boolean isStateful();
	method public final boolean isVisible();		method public final boolean isVisible();
	@@ -12321,7 +12320,7 @@ package android.graphics.drawable {
	method public void setChangingConfigurations(int);		method public void setChangingConfigurations(int);
	method public abstract void setColorFilter(android.graphics.ColorFilter);		method public abstract void setColorFilter(android.graphics.ColorFilter);
	method public void setColorFilter(int, android.graphics.PorterDuff.Mode);		method public void setColorFilter(int, android.graphics.PorterDuff.Mode);
	method public void setDither(boolean);		method public deprecated void setDither(boolean);
	method public void setFilterBitmap(boolean);		method public void setFilterBitmap(boolean);
	method public void setHotspot(float, float);		method public void setHotspot(float, float);
	method public void setHotspotBounds(int, int, int, int);		method public void setHotspotBounds(int, int, int, int);

Original line number	Original line	Diff line number	Diff line
	@@ -12627,7 +12627,6 @@ package android.graphics.drawable {
	method public void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet, android.content.res.Resources.Theme) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;		method public void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet, android.content.res.Resources.Theme) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
	method public void invalidateSelf();		method public void invalidateSelf();
	method public boolean isAutoMirrored();		method public boolean isAutoMirrored();
	method public boolean isDither();
	method public boolean isFilterBitmap();		method public boolean isFilterBitmap();
	method public boolean isStateful();		method public boolean isStateful();
	method public final boolean isVisible();		method public final boolean isVisible();
	@@ -12647,7 +12646,7 @@ package android.graphics.drawable {
	method public void setChangingConfigurations(int);		method public void setChangingConfigurations(int);
	method public abstract void setColorFilter(android.graphics.ColorFilter);		method public abstract void setColorFilter(android.graphics.ColorFilter);
	method public void setColorFilter(int, android.graphics.PorterDuff.Mode);		method public void setColorFilter(int, android.graphics.PorterDuff.Mode);
	method public void setDither(boolean);		method public deprecated void setDither(boolean);
	method public void setFilterBitmap(boolean);		method public void setFilterBitmap(boolean);
	method public void setHotspot(float, float);		method public void setHotspot(float, float);
	method public void setHotspotBounds(int, int, int, int);		method public void setHotspotBounds(int, int, int, int);