diff options
| author | Chet Haase <chet@google.com> | 2013-09-27 00:26:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-27 00:26:22 +0000 |
| commit | 033837dd6bf32b33d9a67d340efd167f94bf80cf (patch) | |
| tree | bb60884d841a901846d0a680aab16eee8992b27e /core/java/android/transition/TransitionManager.java | |
| parent | adf149029f701464c66cc5cacbbbc649c1319bcd (diff) | |
| parent | b7a7fc9d233bad507ce893882352618b13647058 (diff) | |
Merge "Make fading transitions work better" into klp-dev
Diffstat (limited to 'core/java/android/transition/TransitionManager.java')
| -rw-r--r-- | core/java/android/transition/TransitionManager.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/transition/TransitionManager.java b/core/java/android/transition/TransitionManager.java index 44ca4e58fd94..9be91d007638 100644 --- a/core/java/android/transition/TransitionManager.java +++ b/core/java/android/transition/TransitionManager.java @@ -178,6 +178,11 @@ public class TransitionManager { Transition transitionClone = transition.clone(); transitionClone.setSceneRoot(sceneRoot); + Scene oldScene = Scene.getCurrentScene(sceneRoot); + if (oldScene != null && oldScene.isCreatedFromLayoutResource()) { + transitionClone.setCanRemoveViews(true); + } + sceneChangeSetup(sceneRoot, transitionClone); scene.enter(); |