diff options
| author | George Mount <mount@google.com> | 2014-09-08 15:10:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-08 15:10:54 +0000 |
| commit | d6ccafaf3fd7549eecb6617663a30b695b45d65c (patch) | |
| tree | 6c14c555534813b473a6ee19d1b39f9920f0f38f /core/java/android/transition/TransitionSet.java | |
| parent | d652526fbef1b39c7e1ad8602fb9f13c4753bca6 (diff) | |
| parent | 7a2cd21aea615bf22c4c9be64c0ba7accc4fdcc2 (diff) | |
| download | frameworks_base-d6ccafaf3fd7549eecb6617663a30b695b45d65c.zip frameworks_base-d6ccafaf3fd7549eecb6617663a30b695b45d65c.tar.gz frameworks_base-d6ccafaf3fd7549eecb6617663a30b695b45d65c.tar.bz2 | |
am 2c84e65e: am 850bca01: Merge "Only call setHasTransientState in captureHierarchy." into lmp-dev
* commit '2c84e65e87d266a7d9b15a9e6719b9f14137fd45':
Only call setHasTransientState in captureHierarchy.
Diffstat (limited to 'core/java/android/transition/TransitionSet.java')
| -rw-r--r-- | core/java/android/transition/TransitionSet.java | 2 |
1 files changed, 1 insertions, 1 deletions
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; |