diff options
author | Romain Guy <romainguy@google.com> | 2011-03-29 18:33:12 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-29 18:33:12 -0700 |
commit | a3cbe69ae693004b2fa459d95578b4b3189c86fb (patch) | |
tree | a4bf8ec60d2260c30f82c7ccfa89c930295e5c25 | |
parent | 03128c2880a8ab9d712c429ccd534b1154d3bd13 (diff) | |
parent | 2660a3ec8564918a243b1b02e3652c514bc93bfc (diff) | |
download | frameworks_base-a3cbe69ae693004b2fa459d95578b4b3189c86fb.zip frameworks_base-a3cbe69ae693004b2fa459d95578b4b3189c86fb.tar.gz frameworks_base-a3cbe69ae693004b2fa459d95578b4b3189c86fb.tar.bz2 |
Merge "Move the drawable state to the correct class. Bug #4170455"
-rw-r--r-- | graphics/java/android/graphics/drawable/BitmapDrawable.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/graphics/java/android/graphics/drawable/BitmapDrawable.java b/graphics/java/android/graphics/drawable/BitmapDrawable.java index 22fbdf9..a278466 100644 --- a/graphics/java/android/graphics/drawable/BitmapDrawable.java +++ b/graphics/java/android/graphics/drawable/BitmapDrawable.java @@ -67,7 +67,6 @@ public class BitmapDrawable extends Drawable { private final Rect mDstRect = new Rect(); // Gravity.apply() sets this private boolean mApplyGravity; - private boolean mRebuildShader; private boolean mMutated; // These are scaled to match the target density. @@ -348,7 +347,7 @@ public class BitmapDrawable extends Drawable { if (state.mTileModeX != xmode || state.mTileModeY != ymode) { state.mTileModeX = xmode; state.mTileModeY = ymode; - mRebuildShader = true; + state.mRebuildShader = true; invalidateSelf(); } } @@ -369,7 +368,7 @@ public class BitmapDrawable extends Drawable { Bitmap bitmap = mBitmap; if (bitmap != null) { final BitmapState state = mBitmapState; - if (mRebuildShader) { + if (state.mRebuildShader) { Shader.TileMode tmx = state.mTileModeX; Shader.TileMode tmy = state.mTileModeY; @@ -380,7 +379,7 @@ public class BitmapDrawable extends Drawable { tmx == null ? Shader.TileMode.CLAMP : tmx, tmy == null ? Shader.TileMode.CLAMP : tmy)); } - mRebuildShader = false; + state.mRebuildShader = false; copyBounds(mDstRect); } @@ -424,7 +423,6 @@ public class BitmapDrawable extends Drawable { public Drawable mutate() { if (!mMutated && super.mutate() == this) { mBitmapState = new BitmapState(mBitmapState); - mRebuildShader = true; mMutated = true; } return this; @@ -511,6 +509,7 @@ public class BitmapDrawable extends Drawable { Shader.TileMode mTileModeX = null; Shader.TileMode mTileModeY = null; int mTargetDensity = DisplayMetrics.DENSITY_DEFAULT; + boolean mRebuildShader; BitmapState(Bitmap bitmap) { mBitmap = bitmap; @@ -524,18 +523,19 @@ public class BitmapDrawable extends Drawable { mTileModeY = bitmapState.mTileModeY; mTargetDensity = bitmapState.mTargetDensity; mPaint = new Paint(bitmapState.mPaint); + mRebuildShader = bitmapState.mRebuildShader; } @Override public Drawable newDrawable() { return new BitmapDrawable(this, null); } - + @Override public Drawable newDrawable(Resources res) { return new BitmapDrawable(this, res); } - + @Override public int getChangingConfigurations() { return mChangingConfigurations; |