diff options
| author | George Mount <mount@google.com> | 2014-05-09 13:17:52 -0700 |
|---|---|---|
| committer | George Mount <mount@google.com> | 2014-05-13 13:07:06 -0700 |
| commit | 30da61d477bcb6cc7718f9516c444359352fe148 (patch) | |
| tree | 0d13170ad1a3e058b954591c0b451aa5f53830ec /core/java/android/transition/TransitionSet.java | |
| parent | abb352a941cbd87c14cce9ccfa83157b913d41f2 (diff) | |
Add view name to Transition matching.
Bug 14625214
Change-Id: Ia1b21e6bd0ea4892b504746e582aeb175e0f0506
Diffstat (limited to 'core/java/android/transition/TransitionSet.java')
| -rw-r--r-- | core/java/android/transition/TransitionSet.java | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/core/java/android/transition/TransitionSet.java b/core/java/android/transition/TransitionSet.java index 90812342e425..698b5638795a 100644 --- a/core/java/android/transition/TransitionSet.java +++ b/core/java/android/transition/TransitionSet.java @@ -272,24 +272,8 @@ public class TransitionSet extends Transition { int numValues = values.viewValues.size(); for (int i = 0; i < numValues; i++) { View view = values.viewValues.keyAt(i); - if (isValidTarget(view, view.getId())) { - included.viewValues.put(view, values.viewValues.valueAt(i)); - } - } - numValues = values.idValues.size(); - for (int i = 0; i < numValues; i++) { - int id = values.idValues.keyAt(i); - TransitionValues transitionValues = values.idValues.valueAt(i); - if (isValidTarget(transitionValues.view, id)) { - included.idValues.put(id, transitionValues); - } - } - numValues = values.itemIdValues.size(); - for (int i = 0; i < numValues; i++) { - long id = values.itemIdValues.keyAt(i); - TransitionValues transitionValues = values.itemIdValues.valueAt(i); - if (isValidTarget(transitionValues.view, id)) { - included.itemIdValues.put(id, transitionValues); + if (isValidTarget(view)) { + addViewValues(included, view, values.viewValues.valueAt(i)); } } return included; @@ -328,10 +312,9 @@ public class TransitionSet extends Transition { @Override public void captureStartValues(TransitionValues transitionValues) { - int targetId = transitionValues.view.getId(); - if (isValidTarget(transitionValues.view, targetId)) { + if (isValidTarget(transitionValues.view)) { for (Transition childTransition : mTransitions) { - if (childTransition.isValidTarget(transitionValues.view, targetId)) { + if (childTransition.isValidTarget(transitionValues.view)) { childTransition.captureStartValues(transitionValues); } } @@ -340,10 +323,9 @@ public class TransitionSet extends Transition { @Override public void captureEndValues(TransitionValues transitionValues) { - int targetId = transitionValues.view.getId(); - if (isValidTarget(transitionValues.view, targetId)) { + if (isValidTarget(transitionValues.view)) { for (Transition childTransition : mTransitions) { - if (childTransition.isValidTarget(transitionValues.view, targetId)) { + if (childTransition.isValidTarget(transitionValues.view)) { childTransition.captureEndValues(transitionValues); } } |