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

Merge "Call Scene's exit action when use TransitionManager.go() with null transition"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-09-27 02:04:32 +00:00
committed by Android (Google) Code Review
parent f20506f4a2 0a6085e87a
commit f5d728745d
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -189,6 +189,8 @@ public class TransitionManager {
final ViewGroup sceneRoot = scene.getSceneRoot();
if (!sPendingTransitions.contains(sceneRoot)) {
if (transition == null) {
exitPreviousScene(sceneRoot);
scene.enter();
} else {
sPendingTransitions.add(sceneRoot);
@@ -210,6 +212,14 @@ public class TransitionManager {
}
}
private static void exitPreviousScene(final ViewGroup sceneRoot) {
// Notify previous scene that it is being exited
final Scene previousScene = Scene.getCurrentScene(sceneRoot);
if (previousScene != null) {
previousScene.exit();
}
}
@UnsupportedAppUsage
private static ArrayMap<ViewGroup, ArrayList<Transition>> getRunningTransitions() {
WeakReference<ArrayMap<ViewGroup, ArrayList<Transition>>> runningTransitions =
@@ -339,11 +349,7 @@ public class TransitionManager {
transition.captureValues(sceneRoot, true);
}
// Notify previous scene that it is being exited
Scene previousScene = Scene.getCurrentScene(sceneRoot);
if (previousScene != null) {
previousScene.exit();
}
exitPreviousScene(sceneRoot);
}
/**