diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2010-07-20 11:22:45 -0700 |
---|---|---|
committer | Android Code Review <code-review@android.com> | 2010-07-20 11:22:45 -0700 |
commit | f34a7fbbbeb9c7855327afbbb18b7d9893866475 (patch) | |
tree | af05585be059607adebc7b4223a9d7cdca37a745 | |
parent | 13d33472b273088311dc8787e5c55c41d4632071 (diff) | |
parent | 708654c0b8d45001bc333a3b7b9fd845c81c6f26 (diff) | |
download | frameworks_base-f34a7fbbbeb9c7855327afbbb18b7d9893866475.zip frameworks_base-f34a7fbbbeb9c7855327afbbb18b7d9893866475.tar.gz frameworks_base-f34a7fbbbeb9c7855327afbbb18b7d9893866475.tar.bz2 |
Merge "Shoud specify the Resource class instance as an argument of the method newDrawable and change the name from 'DrawableCacheClear' to 'clearDrawableCache' (additional changes for ID:15815) https://review.source.android.com/#change,15815"
-rwxr-xr-x | core/java/android/content/res/Resources.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java index 3387fc9..e671359 100755 --- a/core/java/android/content/res/Resources.java +++ b/core/java/android/content/res/Resources.java @@ -1305,8 +1305,8 @@ public class Resources { keyboardHidden, mConfiguration.navigation, width, height, mConfiguration.screenLayout, mConfiguration.uiMode, sSdkVersion); - drawableCacheClear(mDrawableCache, configChanges); - drawableCacheClear(mColorDrawableCache, configChanges); + clearDrawableCache(mDrawableCache, configChanges); + clearDrawableCache(mColorDrawableCache, configChanges); mColorStateListCache.clear(); @@ -1320,7 +1320,7 @@ public class Resources { } } - private void drawableCacheClear( + private void clearDrawableCache( LongSparseArray<WeakReference<ConstantState>> cache, int configChanges) { int N = cache.size(); @@ -1781,7 +1781,7 @@ public class Resources { //Log.i(TAG, "Returning cached drawable @ #" + // Integer.toHexString(((Integer)key).intValue()) // + " in " + this + ": " + entry); - return entry.newDrawable(); + return entry.newDrawable(this); } else { // our entry has been purged drawableCache.delete(key); |