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

Merge "Revert "Refresh opacity and statefulness on tint change"" into oc-dev

Browse Source 
am: 61117c61d7

Change-Id: I77085a9cc1465d4c4295e5a6b666b677aec6ce25
This commit is contained in:
Ian Pedowitz
2017-04-04 03:45:50 +00:00
committed by android-build-merger
parent b188c93a45 61117c61d7
commit 3f4d2f28f8
2 changed files with 4 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
graphics/java/android/graphics/drawable/DrawableContainer.java
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;
}

10
graphics/java/android/graphics/drawable/LayerDrawable.java
View File

@@ -986,11 +986,6 @@ public class LayerDrawable extends Drawable implements Drawable.Callback {
if (mSuspendChildInvalidation) {
mChildRequestedInvalidation = true;
} else {
// 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.
mLayerState.invalidateCache();
invalidateSelf();
}
}
@@ -2126,10 +2121,7 @@ public class LayerDrawable extends Drawable implements Drawable.Callback {
return true;
}
/**
* Invalidates the cached opacity and statefulness.
*/
void invalidateCache() {
public void invalidateCache() {
mCheckedOpacity = false;
mCheckedStateful = false;
}