diff options
| -rw-r--r-- | core/java/android/window/TransitionInfo.java | 3 | ||||
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/window/TransitionInfo.java b/core/java/android/window/TransitionInfo.java index c0370cc5517d..8c05130bf5fe 100644 --- a/core/java/android/window/TransitionInfo.java +++ b/core/java/android/window/TransitionInfo.java @@ -493,6 +493,9 @@ public final class TransitionInfo implements Parcelable { if ((flags & FLAG_FIRST_CUSTOM) != 0) { sb.append(sb.length() == 0 ? "" : "|").append("FIRST_CUSTOM"); } + if ((flags & FLAG_MOVED_TO_TOP) != 0) { + sb.append(sb.length() == 0 ? "" : "|").append("MOVE_TO_TOP"); + } return sb.toString(); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java index f33b0778a1b2..d16b497b5aca 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java @@ -492,6 +492,10 @@ public class Transitions implements RemoteCallable<Transitions>, finishT.show(leash); } else if (mode == TRANSIT_CLOSE || mode == TRANSIT_TO_BACK) { finishT.hide(leash); + } else if (isOpening && mode == TRANSIT_CHANGE) { + // Just in case there is a race with another animation (eg. recents finish()). + // Changes are visible->visible so it's a problem if it isn't visible. + t.show(leash); } } } |