Merge "[28/n] Hide letterbox surfaces when activity is not letterboxed" into main (f24d653d) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/LetterboxTransitionObserver.kt

+6 −5

Original line number	Diff line number	Diff line
		@@ -98,13 +98,14 @@ class LetterboxTransitionObserver(
		taskBounds,
		activityBounds
		)
		}
		} else {
		updateLetterboxSurfaceVisibility(
		key,
		startTransaction,
		isTopActivityLetterboxed
		visible = false
		)
		}
		}
		dump()
		}
		}

+3 −2

Original line number	Diff line number	Diff line
		@@ -120,7 +120,7 @@ class LetterboxTransitionObserverTest : ShellTestCase() {
		validateOutput {
		r.creationEventDetected(expected = true)
		r.configureStrategyInvoked(expected = true)
		r.visibilityEventDetected(expected = true, visible = true)
		r.visibilityEventDetected(expected = false)
		r.destroyEventDetected(expected = false)
		r.updateSurfaceBoundsEventDetected(
		expected = true,
		@@ -264,6 +264,7 @@ class LetterboxTransitionObserverTest : ShellTestCase() {
		any<WindowContainerToken>()
		)

		// Visible param is used only if expected is true.
		fun visibilityEventDetected(
		expected: Boolean,
		visible: Boolean = true,
		@@ -272,7 +273,7 @@ class LetterboxTransitionObserverTest : ShellTestCase() {
		) = verify(letterboxController, expected.asMode()).updateLetterboxSurfaceVisibility(
		eq(LetterboxKey(displayId, taskId)),
		any<SurfaceControl.Transaction>(),
		eq(visible)
		if (expected) eq(visible) else any()
		)

		fun destroyEventDetected(