Merge "Fix WallpaperWindowToken visible update with Shell transition" (9131c6a1) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExpandPipOnDoubleClickTest.kt

+0 −9

Original line number	Diff line number	Diff line
		@@ -26,9 +26,6 @@ import com.android.server.wm.flicker.FlickerTestParameterFactory
		import com.android.server.wm.flicker.LAUNCHER_COMPONENT
		import com.android.server.wm.flicker.annotation.Group3
		import com.android.server.wm.flicker.dsl.FlickerBuilder
		import com.android.server.wm.flicker.helpers.isShellTransitionsEnabled
		import org.junit.Assume.assumeFalse
		import org.junit.Before
		import org.junit.FixMethodOrder
		import org.junit.Test
		import org.junit.runner.RunWith
		@@ -65,12 +62,6 @@ class ExpandPipOnDoubleClickTest(testSpec: FlickerTestParameter) : PipTransition
		}
		}

		@Before
		fun onBefore() {
		// This CUJ don't work in shell transitions because of b/204570898 b/204562589
		assumeFalse(isShellTransitionsEnabled)
		}

		/**
		* Checks that the pip app window remains inside the display bounds throughout the whole
		* animation

+1 −1

Original line number	Diff line number	Diff line
		@@ -107,7 +107,7 @@ class WallpaperWindowToken extends WindowToken {
		/** Returns {@code true} if visibility is changed. */
		boolean updateWallpaperWindows(boolean visible) {
		boolean changed = false;
		if (isVisible() != visible) {
		if (mVisibleRequested != visible) {
		ProtoLog.d(WM_DEBUG_WALLPAPER, "Wallpaper token %s visible=%b",
		token, visible);
		setVisibility(visible);