Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d9497f7d: Merge change 25394 into eclair

Browse Source 
Merge commit 'd9497f7dd98da28da320ac2231c6e94a243ce257' into eclair-plus-aosp

* commit 'd9497f7dd98da28da320ac2231c6e94a243ce257':
  Add StateListDrawable's dither flag to the constant state.
This commit is contained in:
Romain Guy
2009-09-17 08:43:12 -07:00
committed by Android Git Automerger
parent f5c25eeda9 d9497f7dd9
commit 31b60307de
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
graphics/java/android/graphics/drawable/DrawableContainer.java
View File

@@ -36,7 +36,6 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
private Drawable mCurrDrawable; private Drawable mCurrDrawable;
private int mAlpha = 0xFF; private int mAlpha = 0xFF;
private ColorFilter mColorFilter; private ColorFilter mColorFilter;
private boolean mDither = DEFAULT_DITHER;
private int mCurIndex = -1; private int mCurIndex = -1;
private boolean mMutated; private boolean mMutated;
@@ -83,10 +82,10 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
@Override @Override
public void setDither(boolean dither) { public void setDither(boolean dither) {
if (mDither != dither) { if (mDrawableContainerState.mDither != dither) {
mDither = dither; mDrawableContainerState.mDither = dither;
if (mCurrDrawable != null) { if (mCurrDrawable != null) {
mCurrDrawable.setDither(mDither); mCurrDrawable.setDither(mDrawableContainerState.mDither);
} }
} }
} }
@@ -212,7 +211,7 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
if (d != null) { if (d != null) {
d.setVisible(isVisible(), true); d.setVisible(isVisible(), true);
d.setAlpha(mAlpha); d.setAlpha(mAlpha);
d.setDither(mDither); d.setDither(mDrawableContainerState.mDither);
d.setColorFilter(mColorFilter); d.setColorFilter(mColorFilter);
d.setState(getState()); d.setState(getState());
d.setLevel(getLevel()); d.setLevel(getLevel());
@@ -285,6 +284,8 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
boolean mCanConstantState; boolean mCanConstantState;
boolean mPaddingChecked = false; boolean mPaddingChecked = false;
boolean mDither = DEFAULT_DITHER;
DrawableContainerState(DrawableContainerState orig, DrawableContainer owner, DrawableContainerState(DrawableContainerState orig, DrawableContainer owner,
Resources res) { Resources res) {
@@ -323,6 +324,8 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
mOpacity = orig.mOpacity; mOpacity = orig.mOpacity;
mHaveStateful = orig.mHaveStateful; mHaveStateful = orig.mHaveStateful;
mStateful = orig.mStateful; mStateful = orig.mStateful;
mDither = orig.mDither;
} else { } else {
mDrawables = new Drawable[10]; mDrawables = new Drawable[10];