diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityRecord.java | 9 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/WallpaperController.java | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 3db031510317..2b2100e56f44 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -5630,11 +5630,18 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A setClientVisible(visible); } + final DisplayContent displayContent = getDisplayContent(); if (!visible) { mImeInsetsFrozenUntilStartInput = true; + if (usingShellTransitions) { + final WindowState wallpaperTarget = + displayContent.mWallpaperController.getWallpaperTarget(); + if (wallpaperTarget != null && wallpaperTarget.mActivityRecord == this) { + displayContent.mWallpaperController.hideWallpapers(wallpaperTarget); + } + } } - final DisplayContent displayContent = getDisplayContent(); if (!displayContent.mClosingApps.contains(this) && !displayContent.mOpeningApps.contains(this) && !fromTransition) { diff --git a/services/core/java/com/android/server/wm/WallpaperController.java b/services/core/java/com/android/server/wm/WallpaperController.java index edafe0606b13..20ce98ca2fae 100644 --- a/services/core/java/com/android/server/wm/WallpaperController.java +++ b/services/core/java/com/android/server/wm/WallpaperController.java @@ -146,11 +146,10 @@ class WallpaperController { } } else { final ActivityRecord ar = w.mActivityRecord; - final TransitionController tc = w.mTransitionController; // The animating window can still be visible on screen if it is in transition, so we // should check whether this window can be wallpaper target even when visibleRequested // is false. - if (ar != null && !ar.isVisibleRequested() && !tc.inTransition(ar)) { + if (ar != null && !ar.isVisibleRequested() && !ar.isVisible()) { // An activity that is not going to remain visible shouldn't be the target. return false; } |