diff options
| author | Alan Viverette <alanv@google.com> | 2015-05-07 21:19:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-07 21:19:59 +0000 |
| commit | 6a8c79bb2b4b0c749e76dc3628ec5200efec4f40 (patch) | |
| tree | 002d055790131d35f38e5a4d0ff68b198e6f1714 /core/java/android/animation | |
| parent | 6fc03e6523ee566ed278c3b64aa344ae95c8d824 (diff) | |
| parent | e54d245b993e1347cb32c23a6bdc907a45fab324 (diff) | |
| download | frameworks_base-6a8c79bb2b4b0c749e76dc3628ec5200efec4f40.zip frameworks_base-6a8c79bb2b4b0c749e76dc3628ec5200efec4f40.tar.gz frameworks_base-6a8c79bb2b4b0c749e76dc3628ec5200efec4f40.tar.bz2 | |
Merge "Improve keying for theme caches, rebase system theme on config change" into mnc-dev
Diffstat (limited to 'core/java/android/animation')
| -rw-r--r-- | core/java/android/animation/AnimatorInflater.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/animation/AnimatorInflater.java b/core/java/android/animation/AnimatorInflater.java index 427ecce..435d5ab 100644 --- a/core/java/android/animation/AnimatorInflater.java +++ b/core/java/android/animation/AnimatorInflater.java @@ -108,7 +108,7 @@ public class AnimatorInflater { float pathErrorScale) throws NotFoundException { final ConfigurationBoundResourceCache<Animator> animatorCache = resources .getAnimatorCache(); - Animator animator = animatorCache.get(id, theme); + Animator animator = animatorCache.getInstance(id, theme); if (animator != null) { if (DBG_ANIMATOR_INFLATER) { Log.d(TAG, "loaded animator from cache, " + resources.getResourceName(id)); @@ -157,7 +157,7 @@ public class AnimatorInflater { final ConfigurationBoundResourceCache<StateListAnimator> cache = resources .getStateListAnimatorCache(); final Theme theme = context.getTheme(); - StateListAnimator animator = cache.get(id, theme); + StateListAnimator animator = cache.getInstance(id, theme); if (animator != null) { return animator; } |