Merge "Don't drop the drawable cache completely on configuration change"

Author: Dianne Hackborn

core/java/android/content/res/Resources.java

@@ -1352,7 +1352,6 @@ private void clearDrawableCache(
                 }
             }
         }
-        cache.clear();
     }
 
     /**

graphics/java/android/graphics/drawable/AnimatedRotateDrawable.java

@@ -204,7 +204,7 @@ public int getIntrinsicHeight() {
     @Override
     public ConstantState getConstantState() {
         if (mState.canConstantState()) {
-            mState.mChangingConfigurations = super.getChangingConfigurations();
+            mState.mChangingConfigurations = getChangingConfigurations();
             return mState;
         }
         return null;

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

@@ -427,7 +427,7 @@ public int getOpacity() {
 
     @Override
     public final ConstantState getConstantState() {
-        mBitmapState.mChangingConfigurations = super.getChangingConfigurations();
+        mBitmapState.mChangingConfigurations = getChangingConfigurations();
         return mBitmapState;
     }
 

graphics/java/android/graphics/drawable/ClipDrawable.java

@@ -229,7 +229,7 @@ public int getIntrinsicHeight() {
     @Override
     public ConstantState getConstantState() {
         if (mClipState.canConstantState()) {
-            mClipState.mChangingConfigurations = super.getChangingConfigurations();
+            mClipState.mChangingConfigurations = getChangingConfigurations();
             return mClipState;
         }
         return null;

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

@@ -124,7 +124,7 @@ public void inflate(Resources r, XmlPullParser parser, AttributeSet attrs)
 
     @Override
     public ConstantState getConstantState() {
-        mState.mChangingConfigurations = super.getChangingConfigurations();
+        mState.mChangingConfigurations = getChangingConfigurations();
         return mState;
     }
 

graphics/java/android/graphics/drawable/DrawableContainer.java

@@ -236,7 +236,7 @@ public Drawable getCurrent() {
     @Override
     public ConstantState getConstantState() {
         if (mDrawableContainerState.canConstantState()) {
-            mDrawableContainerState.mChangingConfigurations = super.getChangingConfigurations();
+            mDrawableContainerState.mChangingConfigurations = getChangingConfigurations();
             return mDrawableContainerState;
         }
         return null;

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

@@ -832,7 +832,7 @@ public int getIntrinsicHeight() {
 
     @Override
     public ConstantState getConstantState() {
-        mGradientState.mChangingConfigurations = super.getChangingConfigurations();
+        mGradientState.mChangingConfigurations = getChangingConfigurations();
         return mGradientState;
     }
 

graphics/java/android/graphics/drawable/InsetDrawable.java

@@ -238,7 +238,7 @@ public int getIntrinsicHeight() {
     @Override
     public ConstantState getConstantState() {
         if (mInsetState.canConstantState()) {
-            mInsetState.mChangingConfigurations = super.getChangingConfigurations();
+            mInsetState.mChangingConfigurations = getChangingConfigurations();
             return mInsetState;
         }
         return null;

graphics/java/android/graphics/drawable/LayerDrawable.java

@@ -523,7 +523,7 @@ private void ensurePadding() {
     @Override
     public ConstantState getConstantState() {
         if (mLayerState.canConstantState()) {
-            mLayerState.mChangingConfigurations = super.getChangingConfigurations();
+            mLayerState.mChangingConfigurations = getChangingConfigurations();
             return mLayerState;
         }
         return null;

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

@@ -327,7 +327,7 @@ public Region getTransparentRegion() {
 
     @Override
     public ConstantState getConstantState() {
-        mNinePatchState.mChangingConfigurations = super.getChangingConfigurations();
+        mNinePatchState.mChangingConfigurations = getChangingConfigurations();
         return mNinePatchState;
     }