am 24755d2b: Merge "mutate() didn\'t work as advertised Bug #7162705" into jb-mr1-dev (40f14aa2) · Commits · e / os / android_frameworks_base

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

+0 −9

Original line number	Diff line number	Diff line
		@@ -80,7 +80,6 @@ public class BitmapDrawable extends Drawable {
		@Deprecated
		public BitmapDrawable() {
		mBitmapState = new BitmapState((Bitmap) null);
		mMutated = true;
		}

		/**
		@@ -91,7 +90,6 @@ public class BitmapDrawable extends Drawable {
		public BitmapDrawable(Resources res) {
		mBitmapState = new BitmapState((Bitmap) null);
		mBitmapState.mTargetDensity = mTargetDensity;
		mMutated = true;
		}

		/**
		@@ -102,7 +100,6 @@ public class BitmapDrawable extends Drawable {
		@Deprecated
		public BitmapDrawable(Bitmap bitmap) {
		this(new BitmapState(bitmap), null);
		mMutated = true;
		}

		/**
		@@ -112,7 +109,6 @@ public class BitmapDrawable extends Drawable {
		public BitmapDrawable(Resources res, Bitmap bitmap) {
		this(new BitmapState(bitmap), res);
		mBitmapState.mTargetDensity = mTargetDensity;
		mMutated = true;
		}

		/**
		@@ -126,7 +122,6 @@ public class BitmapDrawable extends Drawable {
		if (mBitmap == null) {
		android.util.Log.w("BitmapDrawable", "BitmapDrawable cannot decode " + filepath);
		}
		mMutated = true;
		}

		/**
		@@ -139,7 +134,6 @@ public class BitmapDrawable extends Drawable {
		if (mBitmap == null) {
		android.util.Log.w("BitmapDrawable", "BitmapDrawable cannot decode " + filepath);
		}
		mMutated = true;
		}

		/**
		@@ -153,7 +147,6 @@ public class BitmapDrawable extends Drawable {
		if (mBitmap == null) {
		android.util.Log.w("BitmapDrawable", "BitmapDrawable cannot decode " + is);
		}
		mMutated = true;
		}

		/**
		@@ -166,7 +159,6 @@ public class BitmapDrawable extends Drawable {
		if (mBitmap == null) {
		android.util.Log.w("BitmapDrawable", "BitmapDrawable cannot decode " + is);
		}
		mMutated = true;
		}

		/**
		@@ -560,7 +552,6 @@ public class BitmapDrawable extends Drawable {
		} else {
		mTargetDensity = state.mTargetDensity;
		}
		mMutated = false;
		setBitmap(state != null ? state.mBitmap : null);
		}
		}

graphics/java/android/graphics/drawable/ColorDrawable.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -43,7 +43,6 @@ public class ColorDrawable extends Drawable {
		*/
		public ColorDrawable() {
		this(null);
		mMutated = true;
		}

		/**
		@@ -54,7 +53,6 @@ public class ColorDrawable extends Drawable {
		public ColorDrawable(int color) {
		this(null);
		setColor(color);
		mMutated = true;
		}

		private ColorDrawable(ColorState state) {

graphics/java/android/graphics/drawable/GradientDrawable.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -124,7 +124,7 @@ public class GradientDrawable extends Drawable {

		private Paint mLayerPaint; // internal, used if we use saveLayer()
		private boolean mRectIsDirty; // internal state
		private boolean mMutated = true;
		private boolean mMutated;
		private Path mRingPath;
		private boolean mPathIsDirty = true;

graphics/java/android/graphics/drawable/NinePatchDrawable.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -77,7 +77,6 @@ public class NinePatchDrawable extends Drawable {
		@Deprecated
		public NinePatchDrawable(Bitmap bitmap, byte[] chunk, Rect padding, String srcName) {
		this(new NinePatchState(new NinePatch(bitmap, chunk, srcName), padding), null);
		mMutated = true;
		}

		/**
		@@ -88,7 +87,6 @@ public class NinePatchDrawable extends Drawable {
		Rect padding, String srcName) {
		this(new NinePatchState(new NinePatch(bitmap, chunk, srcName), padding), res);
		mNinePatchState.mTargetDensity = mTargetDensity;
		mMutated = true;
		}

		/**
		@@ -101,7 +99,6 @@ public class NinePatchDrawable extends Drawable {
		Rect padding, Rect layoutInsets, String srcName) {
		this(new NinePatchState(new NinePatch(bitmap, chunk, srcName), padding, layoutInsets), res);
		mNinePatchState.mTargetDensity = mTargetDensity;
		mMutated = true;
		}

		/**
		@@ -112,7 +109,6 @@ public class NinePatchDrawable extends Drawable {
		@Deprecated
		public NinePatchDrawable(NinePatch patch) {
		this(new NinePatchState(patch, new Rect()), null);
		mMutated = true;
		}

		/**
		@@ -122,7 +118,6 @@ public class NinePatchDrawable extends Drawable {
		public NinePatchDrawable(Resources res, NinePatch patch) {
		this(new NinePatchState(patch, new Rect()), res);
		mNinePatchState.mTargetDensity = mTargetDensity;
		mMutated = true;
		}

		private void setNinePatchState(NinePatchState state, Resources res) {