diff options
| author | Doris Liu <tianliu@google.com> | 2015-05-11 13:23:31 -0700 |
|---|---|---|
| committer | Filip Gruszczynski <gruszczy@google.com> | 2015-06-10 22:54:09 +0000 |
| commit | 629ba0e2b3edd2455b35eb65df2bc677042344b2 (patch) | |
| tree | f1878ed5553228c2c3e21c1f6cfe4f8865d277c7 | |
| parent | 497176975f59a939f12feefb31f2f02560b6f265 (diff) | |
| download | frameworks_base-629ba0e2b3edd2455b35eb65df2bc677042344b2.zip frameworks_base-629ba0e2b3edd2455b35eb65df2bc677042344b2.tar.gz frameworks_base-629ba0e2b3edd2455b35eb65df2bc677042344b2.tar.bz2 | |
DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes
This fix is to take advantage of ArrayMap, which is a key-value
mapping data structure that is more memory efficient than HashMap.
Bug: 11604254
Change-Id: I57006880de570a4d7f3899e274cf0a06355d116b
(cherry picked from commit d7444427d9f44b6b7448d4c21edca866132c8b59)
| -rw-r--r-- | core/java/android/animation/AnimatorSet.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/animation/AnimatorSet.java b/core/java/android/animation/AnimatorSet.java index 5055b29..075f203 100644 --- a/core/java/android/animation/AnimatorSet.java +++ b/core/java/android/animation/AnimatorSet.java @@ -16,9 +16,10 @@ package android.animation; +import android.util.ArrayMap; + import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; import java.util.List; /** @@ -68,7 +69,7 @@ public final class AnimatorSet extends Animator { * to a single node representing that Animator, not create a new Node * if one already exists. */ - private HashMap<Animator, Node> mNodeMap = new HashMap<Animator, Node>(); + private ArrayMap<Animator, Node> mNodeMap = new ArrayMap<Animator, Node>(); /** * Set of all nodes created for this AnimatorSet. This list is used upon @@ -646,7 +647,7 @@ public final class AnimatorSet extends Animator { anim.mTerminated = false; anim.mStarted = false; anim.mPlayingSet = new ArrayList<Animator>(); - anim.mNodeMap = new HashMap<Animator, Node>(); + anim.mNodeMap = new ArrayMap<Animator, Node>(); anim.mNodes = new ArrayList<Node>(nodeCount); anim.mSortedNodes = new ArrayList<Node>(nodeCount); anim.mReversible = mReversible; |