From d0549f2e903fc3998e1db585d4df6384b606b164 Mon Sep 17 00:00:00 2001 From: George Mount Date: Tue, 20 Sep 2016 15:19:03 -0700 Subject: [PATCH] Fix TransitionManager.go with null Transition. Bug: 31529500 Test: I8e5a3285bc5e2b34a1eb32afd67e3184c6d8897e Change-Id: Ibf273d5acab4e32420093adc395034b2246bd530 --- .../android/transition/TransitionManager.java | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/core/java/android/transition/TransitionManager.java b/core/java/android/transition/TransitionManager.java index 16f3bc050a89b..479f49368191d 100644 --- a/core/java/android/transition/TransitionManager.java +++ b/core/java/android/transition/TransitionManager.java @@ -185,25 +185,25 @@ public class TransitionManager { final ViewGroup sceneRoot = scene.getSceneRoot(); if (!sPendingTransitions.contains(sceneRoot)) { - sPendingTransitions.add(sceneRoot); + if (transition == null) { + scene.enter(); + } else { + sPendingTransitions.add(sceneRoot); - Transition transitionClone = null; - if (transition != null) { - transitionClone = transition.clone(); + 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(); + + sceneChangeRunTransition(sceneRoot, transitionClone); } - - Scene oldScene = Scene.getCurrentScene(sceneRoot); - if (oldScene != null && transitionClone != null && - oldScene.isCreatedFromLayoutResource()) { - transitionClone.setCanRemoveViews(true); - } - - sceneChangeSetup(sceneRoot, transitionClone); - - scene.enter(); - - sceneChangeRunTransition(sceneRoot, transitionClone); } }