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

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

Browse Source
This commit is contained in:
Dianne Hackborn
2011-01-14 15:37:28 -08:00
committed by Android (Google) Code Review
parent 604363dc63 6efd2bad95
commit 0b08c5cb14
13 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/content/res/Resources.java
View File

@@ -1476,7 +1476,6 @@ public class Resources {
}
}
}
cache.clear();
}
/**

2
graphics/java/android/graphics/drawable/AnimatedRotateDrawable.java
View File

@@ -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;

2
graphics/java/android/graphics/drawable/BitmapDrawable.java
View File

@@ -439,7 +439,7 @@ public class BitmapDrawable extends Drawable {
@Override
public final ConstantState getConstantState() {
mBitmapState.mChangingConfigurations = super.getChangingConfigurations();
mBitmapState.mChangingConfigurations = getChangingConfigurations();
return mBitmapState;
}

2
graphics/java/android/graphics/drawable/ClipDrawable.java
View File

@@ -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;

2
graphics/java/android/graphics/drawable/ColorDrawable.java
View File

@@ -149,7 +149,7 @@ public class ColorDrawable extends Drawable {
@Override
public ConstantState getConstantState() {
mState.mChangingConfigurations = super.getChangingConfigurations();
mState.mChangingConfigurations = getChangingConfigurations();
return mState;
}

2
graphics/java/android/graphics/drawable/DrawableContainer.java
View File

@@ -389,7 +389,7 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
@Override
public ConstantState getConstantState() {
if (mDrawableContainerState.canConstantState()) {
mDrawableContainerState.mChangingConfigurations = super.getChangingConfigurations();
mDrawableContainerState.mChangingConfigurations = getChangingConfigurations();
return mDrawableContainerState;
}
return null;

2
graphics/java/android/graphics/drawable/GradientDrawable.java
View File

@@ -861,7 +861,7 @@ public class GradientDrawable extends Drawable {
@Override
public ConstantState getConstantState() {
mGradientState.mChangingConfigurations = super.getChangingConfigurations();
mGradientState.mChangingConfigurations = getChangingConfigurations();
return mGradientState;
}

2
graphics/java/android/graphics/drawable/InsetDrawable.java
View File

@@ -241,7 +241,7 @@ public class InsetDrawable extends Drawable implements Drawable.Callback
@Override
public ConstantState getConstantState() {
if (mInsetState.canConstantState()) {
mInsetState.mChangingConfigurations = super.getChangingConfigurations();
mInsetState.mChangingConfigurations = getChangingConfigurations();
return mInsetState;
}
return null;

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

@@ -557,7 +557,7 @@ public class LayerDrawable extends Drawable implements Drawable.Callback {
@Override
public ConstantState getConstantState() {
if (mLayerState.canConstantState()) {
mLayerState.mChangingConfigurations = super.getChangingConfigurations();
mLayerState.mChangingConfigurations = getChangingConfigurations();
return mLayerState;
}
return null;

2
graphics/java/android/graphics/drawable/NinePatchDrawable.java
View File

@@ -323,7 +323,7 @@ public class NinePatchDrawable extends Drawable {
@Override
public ConstantState getConstantState() {
mNinePatchState.mChangingConfigurations = super.getChangingConfigurations();
mNinePatchState.mChangingConfigurations = getChangingConfigurations();
return mNinePatchState;
}

2
graphics/java/android/graphics/drawable/RotateDrawable.java
View File

@@ -192,7 +192,7 @@ public class RotateDrawable extends Drawable implements Drawable.Callback {
@Override
public ConstantState getConstantState() {
if (mState.canConstantState()) {
mState.mChangingConfigurations = super.getChangingConfigurations();
mState.mChangingConfigurations = getChangingConfigurations();
return mState;
}
return null;

2
graphics/java/android/graphics/drawable/ScaleDrawable.java
View File

@@ -241,7 +241,7 @@ public class ScaleDrawable extends Drawable implements Drawable.Callback {
@Override
public ConstantState getConstantState() {
if (mScaleState.canConstantState()) {
mScaleState.mChangingConfigurations = super.getChangingConfigurations();
mScaleState.mChangingConfigurations = getChangingConfigurations();
return mScaleState;
}
return null;

2
graphics/java/android/graphics/drawable/ShapeDrawable.java
View File

@@ -356,7 +356,7 @@ public class ShapeDrawable extends Drawable {
@Override
public ConstantState getConstantState() {
mShapeState.mChangingConfigurations = super.getChangingConfigurations();
mShapeState.mChangingConfigurations = getChangingConfigurations();
return mShapeState;
}