Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix TransitionManager.go() to allow null transitions" into lmp-dev

Browse Source
This commit is contained in:
Chet Haase
2014-09-03 15:19:28 +00:00
committed by Android (Google) Code Review
parent 67b4b2cdb4 5a7cf3eeeb
commit 95f3bcdce0
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/transition/TransitionManager.java
View File

@@ -182,11 +182,15 @@ public class TransitionManager {
final ViewGroup sceneRoot = scene.getSceneRoot();
Transition transitionClone = transition.clone();
transitionClone.setSceneRoot(sceneRoot);
Transition transitionClone = null;
if (transition != null) {
transitionClone = transition.clone();
transitionClone.setSceneRoot(sceneRoot);
}
Scene oldScene = Scene.getCurrentScene(sceneRoot);
if (oldScene != null && oldScene.isCreatedFromLayoutResource()) {
if (oldScene != null && transitionClone != null &&
oldScene.isCreatedFromLayoutResource()) {
transitionClone.setCanRemoveViews(true);
}