Merge "Update wallpaper target if the current target is gone" into tm-qpr-dev (50aee330) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -2089,7 +2089,7 @@ public class WindowManagerService extends IWindowManager.Stub
		if (win.mAttrs.type == TYPE_WALLPAPER) {
		dc.mWallpaperController.clearLastWallpaperTimeoutTime();
		dc.pendingLayoutChanges \|= FINISH_LAYOUT_REDO_WALLPAPER;
		} else if (win.hasWallpaper()) {
		} else if (dc.mWallpaperController.isWallpaperTarget(win)) {
		dc.pendingLayoutChanges \|= FINISH_LAYOUT_REDO_WALLPAPER;
		}

+16 −0

Original line number	Diff line number	Diff line
		@@ -246,6 +246,22 @@ public class WallpaperControllerTests extends WindowTestsBase {
		assertEquals(otherWindowInitialZoom, wallpaperWindow.mWallpaperZoomOut, .01f);
		}

		@Test
		public void testUpdateWallpaperTarget() {
		final DisplayContent dc = mDisplayContent;
		final WindowState homeWin = createWallpaperTargetWindow(dc);
		final WindowState appWin = createWindow(null, TYPE_BASE_APPLICATION, "app");
		final RecentsAnimationController recentsController = mock(RecentsAnimationController.class);
		doReturn(true).when(recentsController).isWallpaperVisible(eq(appWin));
		mWm.setRecentsAnimationController(recentsController);

		dc.mWallpaperController.adjustWallpaperWindows();
		assertEquals(appWin, dc.mWallpaperController.getWallpaperTarget());
		// The wallpaper target is gone, so it should adjust to the next target.
		appWin.removeImmediately();
		assertEquals(homeWin, dc.mWallpaperController.getWallpaperTarget());
		}

		/**
		* Tests that the windowing mode of the wallpaper window must always be fullscreen.
		*/