Merge "[SB] Delete StatusBarModePerDisplayRepository#clearTransient" into main (1eb6674d) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/core/StatusBarOrchestratorTest.kt

+8 −8

Original line number	Diff line number	Diff line
		@@ -200,7 +200,7 @@ class StatusBarOrchestratorTest : SysuiTestCase() {
		fun statusBarModeChange_transitionsToModeWithAnimation() =
		testScope.runTest {
		awakeDevice()
		clearTransientStatusBar()
		abortTransientStatusBar()
		setStatusBarWindowState(StatusBarWindowState.Showing)
		setStatusBarMode(TRANSPARENT)

		@@ -214,7 +214,7 @@ class StatusBarOrchestratorTest : SysuiTestCase() {
		fun statusBarModeChange_keepsTransitioningAsModeChanges() =
		testScope.runTest {
		awakeDevice()
		clearTransientStatusBar()
		abortTransientStatusBar()
		setStatusBarWindowState(StatusBarWindowState.Showing)
		setStatusBarMode(TRANSPARENT)

		@@ -254,7 +254,7 @@ class StatusBarOrchestratorTest : SysuiTestCase() {
		fun statusBarModeChange_windowIsHidden_transitionsToModeWithoutAnimation() =
		testScope.runTest {
		awakeDevice()
		clearTransientStatusBar()
		abortTransientStatusBar()
		setStatusBarWindowState(StatusBarWindowState.Hidden)
		setStatusBarMode(TRANSPARENT)

		@@ -268,7 +268,7 @@ class StatusBarOrchestratorTest : SysuiTestCase() {
		fun statusBarModeChange_deviceIsAsleep_transitionsToModeWithoutAnimation() =
		testScope.runTest {
		putDeviceToSleep()
		clearTransientStatusBar()
		abortTransientStatusBar()
		setStatusBarWindowState(StatusBarWindowState.Showing)
		setStatusBarMode(TRANSPARENT)

		@@ -282,7 +282,7 @@ class StatusBarOrchestratorTest : SysuiTestCase() {
		fun statusBarModeAnimationConditionsChange_withoutBarModeChange_noNewTransitionsHappen() =
		testScope.runTest {
		awakeDevice()
		clearTransientStatusBar()
		abortTransientStatusBar()
		setStatusBarWindowState(StatusBarWindowState.Showing)
		setStatusBarMode(TRANSPARENT)

		@@ -291,7 +291,7 @@ class StatusBarOrchestratorTest : SysuiTestCase() {
		putDeviceToSleep()
		awakeDevice()
		setTransientStatusBar()
		clearTransientStatusBar()
		abortTransientStatusBar()

		verify(fakeStatusBarInitializer.statusBarTransitions, times(1))
		.transitionTo(TRANSPARENT.toTransitionModeInt(), /* animate= */ true)
		@@ -347,8 +347,8 @@ class StatusBarOrchestratorTest : SysuiTestCase() {
		fakeStatusBarModePerDisplayRepository.showTransient()
		}

		private fun clearTransientStatusBar() {
		fakeStatusBarModePerDisplayRepository.clearTransient()
		private fun abortTransientStatusBar() {
		fakeStatusBarModePerDisplayRepository.abortTransient()
		}

		private fun setStatusBarWindowState(state: StatusBarWindowState) {

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/data/repository/StatusBarModeRepositoryImplTest.kt

+0 −15

Original line number	Diff line number	Diff line
		@@ -217,21 +217,6 @@ class StatusBarModeRepositoryImplTest : SysuiTestCase() {
		assertThat(underTest.isTransientShown.value).isTrue()
		}

		@Test
		fun isTransientShown_clearTransient_false() {
		// Start as true
		commandQueueCallback.showTransient(
		DISPLAY_ID,
		WindowInsets.Type.statusBars(),
		/* isGestureOnSystemBar= */ false,
		)
		assertThat(underTest.isTransientShown.value).isTrue()

		underTest.clearTransient()

		assertThat(underTest.isTransientShown.value).isFalse()
		}

		@Test
		fun isInFullscreenMode_visibleTypesHasStatusBar_false() =
		testScope.runTest {

packages/SystemUI/src/com/android/systemui/statusbar/data/repository/StatusBarModePerDisplayRepository.kt

+0 −12

Original line number	Diff line number	Diff line
		@@ -101,14 +101,6 @@ interface StatusBarModePerDisplayRepository : OnStatusBarViewInitializedListener
		*/
		fun showTransient()

		/**
		* Requests for the status bar to be no longer showing transiently.
		*
		* TODO(b/277764509): Don't allow [CentralSurfaces] to set the transient mode; have it
		* determined internally instead.
		*/
		fun clearTransient()

		/**
		* Called when the [StatusBarModePerDisplayRepository] should stop doing any work and clean up
		* if needed.
		@@ -321,10 +313,6 @@ constructor(
		_isTransientShown.value = true
		}

		override fun clearTransient() {
		_isTransientShown.value = false
		}

		private fun modifyAppearanceIfNeeded(
		appearance: Int,
		appearanceRegions: List<AppearanceRegion>,

packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/data/repository/FakeStatusBarModeRepository.kt

+2 −1

Original line number	Diff line number	Diff line
		@@ -53,13 +53,14 @@ class FakeStatusBarModePerDisplayRepository : StatusBarModePerDisplayRepository
		isTransientShown.value = true
		}

		override fun clearTransient() {
		fun abortTransient() {
		isTransientShown.value = false
		}

		override fun start() {}

		override fun stop() {}

		override fun setOngoingProcessRequiresStatusBarVisible(requiredVisible: Boolean) {
		ongoingProcessRequiresStatusBarVisible.value = requiredVisible
		}