diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/RootWindowContainer.java | 8 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/Transition.java | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java index 0826904d10e0..535bbb74d1e3 100644 --- a/services/core/java/com/android/server/wm/RootWindowContainer.java +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java @@ -1037,13 +1037,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> } } - final boolean curDisplayInTransitNotAnimate = - // legacy transition - (curDisplay.mAppTransition.isRunning() && !curDisplay.isAppTransitioning()) - // shell transition - || (curDisplay.mTransitionController.isShellTransitionsEnabled() - && !curDisplay.mTransitionController.isPlaying()); - if (curDisplayInTransitNotAnimate) { + if (curDisplay.mAppTransition.isRunning() && !curDisplay.isAppTransitioning()) { // We have finished the animation of an app transition. To do this, we have // delayed a lot of operations like showing and hiding apps, moving apps in // Z-order, etc. diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java index 1c4004465886..a4771082b3e9 100644 --- a/services/core/java/com/android/server/wm/Transition.java +++ b/services/core/java/com/android/server/wm/Transition.java @@ -497,6 +497,11 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe if (fadeRotationController != null) { fadeRotationController.onTransitionFinished(); } + // Transient-launch activities cannot be IME target (WindowState#canBeImeTarget), + // so re-compute in case the IME target is changed after transition. + if (mTransientLaunches != null) { + mTargetDisplay.computeImeTarget(true /* updateImeTarget */); + } } void abort() { |