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

Commit 0b08c5cb authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

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

parents 604363dc 6efd2bad

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

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

            }

        }

        cache.clear();

    }



    /**

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

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,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
@@ -439,7 +439,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
@@ -232,7 +232,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
@@ -149,7 +149,7 @@ public class ColorDrawable extends Drawable { 


    @Override

    public ConstantState getConstantState() {

        mState.mChangingConfigurations = super.getChangingConfigurations();

        mState.mChangingConfigurations = getChangingConfigurations();

        return mState;

    }