summaryrefslogtreecommitdiffstats
path: root/core/java/android/transition/TransitionValuesMaps.java
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2014-05-13 20:08:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-13 20:08:20 +0000
commitd8d99984c5beffa9a01e82ad9e1fee6a8841d3c0 (patch)
tree7bec78e0d23f31b5dbaf27a574de54fb0d3e78d5 /core/java/android/transition/TransitionValuesMaps.java
parent50a2fb9ea743b1d23ece0d744ae9c2886286039d (diff)
parent30da61d477bcb6cc7718f9516c444359352fe148 (diff)
downloadframeworks_base-d8d99984c5beffa9a01e82ad9e1fee6a8841d3c0.zip
frameworks_base-d8d99984c5beffa9a01e82ad9e1fee6a8841d3c0.tar.gz
frameworks_base-d8d99984c5beffa9a01e82ad9e1fee6a8841d3c0.tar.bz2
Merge "Add view name to Transition matching."
Diffstat (limited to 'core/java/android/transition/TransitionValuesMaps.java')
-rw-r--r--core/java/android/transition/TransitionValuesMaps.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/transition/TransitionValuesMaps.java b/core/java/android/transition/TransitionValuesMaps.java
index 131596b..6d5700a 100644
--- a/core/java/android/transition/TransitionValuesMaps.java
+++ b/core/java/android/transition/TransitionValuesMaps.java
@@ -24,7 +24,7 @@ import android.view.View;
class TransitionValuesMaps {
ArrayMap<View, TransitionValues> viewValues =
new ArrayMap<View, TransitionValues>();
- SparseArray<TransitionValues> idValues = new SparseArray<TransitionValues>();
- LongSparseArray<TransitionValues> itemIdValues =
- new LongSparseArray<TransitionValues>();
+ SparseArray<View> idValues = new SparseArray<View>();
+ LongSparseArray<View> itemIdValues = new LongSparseArray<View>();
+ ArrayMap<String, View> nameValues = new ArrayMap<String, View>();
}