Revert "Refresh opacity and statefulness on tint change"

This reverts commit 1eda069f7c.

Reason to revert:
The setup wizard started throwing android.view.InflateException due to
I89f6d804fb025f426aefdee67559778cf03015bb. Temporarily reverting that
change until we figure out what is going on.

Change-Id: I9344a3402f2fab02f4fe49a6a8ad91970b2d3b3e
Test: Manually verified that the setup wizard no longer crashes.
Bug: 33124798
Bug: 36870685
This commit is contained in:
Yohei Yukawa
2017-04-04 03:30:01 +00:00
parent 1eda069f7c
commit 55fed16929
2 changed files with 4 additions and 31 deletions

View File

@@ -88,9 +88,7 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
}
@Override
public
@Config
int getChangingConfigurations() {
public @Config int getChangingConfigurations() {
return super.getChangingConfigurations()
| mDrawableContainerState.getChangingConfigurations();
}
@@ -212,7 +210,6 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
/**
* Change the global fade duration when a new drawable is entering
* the scene.
*
* @param ms The amount of time to fade in milliseconds.
*/
public void setEnterFadeDuration(int ms) {
@@ -222,7 +219,6 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
/**
* Change the global fade duration when a new drawable is leaving
* the scene.
*
* @param ms The amount of time to fade in milliseconds.
*/
public void setExitFadeDuration(int ms) {
@@ -379,13 +375,6 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
@Override
public void invalidateDrawable(@NonNull Drawable who) {
// This may have been called as the result of a tint changing, in
// which case we may need to refresh the cached statefulness or
// opacity.
if (mDrawableContainerState != null) {
mDrawableContainerState.invalidateCache();
}
if (who == mCurrDrawable && getCallback() != null) {
getCallback().invalidateDrawable(this);
}
@@ -833,8 +822,8 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
mDrawables[pos] = dr;
mNumChildren++;
mChildrenChangingConfigurations |= dr.getChangingConfigurations();
invalidateCache();
mCheckedStateful = false;
mCheckedOpacity = false;
mConstantPadding = null;
mCheckedPadding = false;
@@ -844,14 +833,6 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
return pos;
}
/**
* Invalidates the cached opacity and statefulness.
*/
void invalidateCache() {
mCheckedOpacity = false;
mCheckedStateful = false;
}
final int getCapacity() {
return mDrawables.length;
}