diff options
| author | George Mount <mount@google.com> | 2014-09-08 15:21:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-08 15:21:00 +0000 |
| commit | 7aeb663cee718c398ffb4aa516ad7b8d616f2ef3 (patch) | |
| tree | 3f6a975ab92b94ab1156663a5233c8dc6ff95ffa /core/java/android | |
| parent | cfdfb2262c7b35a738e0f4bb037c516a888c44f8 (diff) | |
| parent | d6ccafaf3fd7549eecb6617663a30b695b45d65c (diff) | |
| download | frameworks_base-7aeb663cee718c398ffb4aa516ad7b8d616f2ef3.zip frameworks_base-7aeb663cee718c398ffb4aa516ad7b8d616f2ef3.tar.gz frameworks_base-7aeb663cee718c398ffb4aa516ad7b8d616f2ef3.tar.bz2 | |
am eada4f05: am 2c84e65e: am 850bca01: Merge "Only call setHasTransientState in captureHierarchy." into lmp-dev
* commit 'eada4f0565a1d6311bba2112feae90ca80fcca41':
Only call setHasTransientState in captureHierarchy.
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/transition/Transition.java | 18 | ||||
| -rw-r--r-- | core/java/android/transition/TransitionSet.java | 2 |
2 files changed, 12 insertions, 8 deletions
diff --git a/core/java/android/transition/Transition.java b/core/java/android/transition/Transition.java index 0d1b568..40bb6ec 100644 --- a/core/java/android/transition/Transition.java +++ b/core/java/android/transition/Transition.java @@ -1417,9 +1417,9 @@ public abstract class Transition implements Cloneable { } capturePropagationValues(values); if (start) { - addViewValues(mStartValues, view, values); + addViewValues(mStartValues, view, values, true); } else { - addViewValues(mEndValues, view, values); + addViewValues(mEndValues, view, values, true); } } } @@ -1460,7 +1460,7 @@ public abstract class Transition implements Cloneable { } static void addViewValues(TransitionValuesMaps transitionValuesMaps, - View view, TransitionValues transitionValues) { + View view, TransitionValues transitionValues, boolean setTransientState) { transitionValuesMaps.viewValues.put(view, transitionValues); int id = view.getId(); if (id >= 0) { @@ -1489,11 +1489,15 @@ public abstract class Transition implements Cloneable { // Duplicate item IDs: cannot match by item ID. View alreadyMatched = transitionValuesMaps.itemIdValues.get(itemId); if (alreadyMatched != null) { - alreadyMatched.setHasTransientState(false); + if (setTransientState) { + alreadyMatched.setHasTransientState(false); + } transitionValuesMaps.itemIdValues.put(itemId, null); } } else { - view.setHasTransientState(true); + if (setTransientState) { + view.setHasTransientState(true); + } transitionValuesMaps.itemIdValues.put(itemId, view); } } @@ -1560,9 +1564,9 @@ public abstract class Transition implements Cloneable { } capturePropagationValues(values); if (start) { - addViewValues(mStartValues, view, values); + addViewValues(mStartValues, view, values, true); } else { - addViewValues(mEndValues, view, values); + addViewValues(mEndValues, view, values, true); } } if (view instanceof ViewGroup) { diff --git a/core/java/android/transition/TransitionSet.java b/core/java/android/transition/TransitionSet.java index f6499ae..56db674 100644 --- a/core/java/android/transition/TransitionSet.java +++ b/core/java/android/transition/TransitionSet.java @@ -408,7 +408,7 @@ public class TransitionSet extends Transition { for (int i = 0; i < numValues; i++) { View view = values.viewValues.keyAt(i); if (isValidTarget(view)) { - addViewValues(included, view, values.viewValues.valueAt(i)); + addViewValues(included, view, values.viewValues.valueAt(i), false); } } return included; |