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

Merge "DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes" into cw-d-mr1-dev

Browse Source
This commit is contained in:
Filip Gruszczynski
2015-06-11 16:40:08 +00:00
committed by Android (Google) Code Review
parent 265d053da9 629ba0e2b3
commit 88bc9753c3
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/animation/AnimatorSet.java
View File

@@ -16,9 +16,10 @@
package android.animation; package android.animation;
import android.util.ArrayMap;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap;
import java.util.List; 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 * to a single node representing that Animator, not create a new Node
* if one already exists. * 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 * 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.mTerminated = false;
anim.mStarted = false; anim.mStarted = false;
anim.mPlayingSet = new ArrayList<Animator>(); anim.mPlayingSet = new ArrayList<Animator>();
anim.mNodeMap = new HashMap<Animator, Node>(); anim.mNodeMap = new ArrayMap<Animator, Node>();
anim.mNodes = new ArrayList<Node>(nodeCount); anim.mNodes = new ArrayList<Node>(nodeCount);
anim.mSortedNodes = new ArrayList<Node>(nodeCount); anim.mSortedNodes = new ArrayList<Node>(nodeCount);
anim.mReversible = mReversible; anim.mReversible = mReversible;