diff options
| author | Chet Haase <chet@google.com> | 2014-09-03 15:19:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-03 15:19:29 +0000 |
| commit | 95f3bcdce0b026369d924982dd3315da8dffaf3a (patch) | |
| tree | b550892a52bfac5af90f0f551d7b133684f1be05 /core/java | |
| parent | 67b4b2cdb429259ffffbff3f42783037b616a749 (diff) | |
| parent | 5a7cf3eeeb208c2dac52541cb09b519b4342a5ff (diff) | |
| download | frameworks_base-95f3bcdce0b026369d924982dd3315da8dffaf3a.zip frameworks_base-95f3bcdce0b026369d924982dd3315da8dffaf3a.tar.gz frameworks_base-95f3bcdce0b026369d924982dd3315da8dffaf3a.tar.bz2 | |
Merge "Fix TransitionManager.go() to allow null transitions" into lmp-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/transition/TransitionManager.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/core/java/android/transition/TransitionManager.java b/core/java/android/transition/TransitionManager.java index ce3cc2f..7bd6287 100644 --- a/core/java/android/transition/TransitionManager.java +++ b/core/java/android/transition/TransitionManager.java @@ -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); } |