Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7314c369 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

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

parents 87b6d2db ac651bd3

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

+0 −1
Original line number Diff line number Diff line
@@ -1359,7 +1359,6 @@ public class Resources { 
                    }

                }

            }

            mDrawableCache.clear();

            mColorStateListCache.clear();

            flushLayoutCache();

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ public class AnimatedRotateDrawable extends Drawable implements Drawable.Callbac 
    @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

+1 −1
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ public class BitmapDrawable extends Drawable { 


    @Override

    public final ConstantState getConstantState() {

        mBitmapState.mChangingConfigurations = super.getChangingConfigurations();

        mBitmapState.mChangingConfigurations = getChangingConfigurations();

        return mBitmapState;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ public class ClipDrawable extends Drawable implements Drawable.Callback { 
    @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

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ public class ColorDrawable extends Drawable { 


    @Override

    public ConstantState getConstantState() {

        mState.mChangingConfigurations = super.getChangingConfigurations();

        mState.mChangingConfigurations = getChangingConfigurations();

        return mState;

    }