Merge "Reduce unnecessary redraw of wallpaper when switching orientation" into udc-dev (72d126cd) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/ActivityRecord.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -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) {

+1 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}