Merge "Deprecate config_enableDesktopFeatureSet" into main (69e5fd0a) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/desktop/domain/interactor/DesktopInteractorTest.kt

+30 −8

Original line number	Diff line number	Diff line
		@@ -51,23 +51,45 @@ class DesktopInteractorTest : SysuiTestCase() {
		}

		@Test
		fun isDesktopFeatureSetEnabled_false() =
		fun isDesktopForFalsingPurposes_false() =
		kosmos.runTest {
		val isDesktopFeatureSetEnabled by collectLastValue(underTest.isDesktopFeatureSetEnabled)
		val isDesktopForFalsingPurposes by
		collectLastValue(underTest.isDesktopForFalsingPurposes)

		overrideConfig(R.bool.config_enableDesktopFeatureSet, false)
		overrideConfig(R.bool.config_isDesktopForFalsingPurposes, false)

		assertThat(isDesktopFeatureSetEnabled).isFalse()
		assertThat(isDesktopForFalsingPurposes).isFalse()
		}

		@Test
		fun isDesktopFeatureSetEnabled_true() =
		fun isDesktopForFalsingPurposes_true() =
		kosmos.runTest {
		val isDesktopFeatureSetEnabled by collectLastValue(underTest.isDesktopFeatureSetEnabled)
		val isDesktopForFalsingPurposes by
		collectLastValue(underTest.isDesktopForFalsingPurposes)

		overrideConfig(R.bool.config_enableDesktopFeatureSet, true)
		overrideConfig(R.bool.config_isDesktopForFalsingPurposes, true)

		assertThat(isDesktopFeatureSetEnabled).isTrue()
		assertThat(isDesktopForFalsingPurposes).isTrue()
		}

		@Test
		fun useDesktopStatusBar_false() =
		kosmos.runTest {
		val useDesktopStatusBar by collectLastValue(underTest.useDesktopStatusBar)

		overrideConfig(R.bool.config_useDesktopStatusBar, false)

		assertThat(useDesktopStatusBar).isFalse()
		}

		@Test
		fun useDesktopStatusBar_true() =
		kosmos.runTest {
		val useDesktopStatusBar by collectLastValue(underTest.useDesktopStatusBar)

		overrideConfig(R.bool.config_useDesktopStatusBar, true)

		assertThat(useDesktopStatusBar).isTrue()
		}

		@EnableFlags(Flags.FLAG_STATUS_BAR_FOR_DESKTOP)

packages/SystemUI/multivalentTests/src/com/android/systemui/notifications/ui/viewmodel/NotificationsShadeOverlayContentViewModelTest.kt

+8 −8

Original line number	Diff line number	Diff line
		@@ -100,25 +100,25 @@ class NotificationsShadeOverlayContentViewModelTest : SysuiTestCase() {
		}

		@Test
		fun showHeader_desktopFeatureSetDisabled_true() =
		fun showHeader_desktopStatusBarDisabled_true() =
		testScope.runTest {
		setEnableDesktopFeatureSet(false)
		setUseDesktopStatusBar(false)
		assertThat(underTest.showHeader).isTrue()
		}

		@Test
		@EnableFlags(StatusBarForDesktop.FLAG_NAME)
		fun showHeader_desktopFeatureSetEnabled_statusBarForDesktopEnabled_false() =
		fun showHeader_desktopStatusBarEnabled_statusBarForDesktopEnabled_false() =
		testScope.runTest {
		setEnableDesktopFeatureSet(true)
		setUseDesktopStatusBar(true)
		assertThat(underTest.showHeader).isFalse()
		}

		@Test
		@DisableFlags(StatusBarForDesktop.FLAG_NAME)
		fun showHeader_desktopFeatureSetEnabled_statusBarForDesktopDisabled_true() =
		fun showHeader_desktopStatusBarEnabled_statusBarForDesktopDisabled_true() =
		testScope.runTest {
		setEnableDesktopFeatureSet(true)
		setUseDesktopStatusBar(true)
		assertThat(underTest.showHeader).isTrue()
		}

		@@ -297,8 +297,8 @@ class NotificationsShadeOverlayContentViewModelTest : SysuiTestCase() {
		assertThat(currentScene).isEqualTo(Scenes.Lockscreen)
		}

		private fun setEnableDesktopFeatureSet(enable: Boolean) {
		overrideConfig(R.bool.config_enableDesktopFeatureSet, enable)
		private fun setUseDesktopStatusBar(enable: Boolean) {
		overrideConfig(R.bool.config_useDesktopStatusBar, enable)
		kosmos.configurationController.onConfigurationChanged(Configuration())
		}

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsShadeOverlayContentViewModelTest.kt

+8 −8

Original line number	Diff line number	Diff line
		@@ -199,31 +199,31 @@ class QuickSettingsShadeOverlayContentViewModelTest : SysuiTestCase() {
		}

		@Test
		fun showHeader_desktopFeatureSetDisabled_true() =
		fun showHeader_desktopStatusBarDisabled_true() =
		kosmos.runTest {
		setEnableDesktopFeatureSet(false)
		setUseDesktopStatusBar(false)
		assertThat(underTest.showHeader).isTrue()
		}

		@Test
		@EnableFlags(StatusBarForDesktop.FLAG_NAME)
		fun showHeader_desktopFeatureSetEnabled_statusBarForDesktopEnabled_false() =
		fun showHeader_desktopStatusBarEnabled_statusBarForDesktopEnabled_false() =
		kosmos.runTest {
		setEnableDesktopFeatureSet(true)
		setUseDesktopStatusBar(true)
		assertThat(underTest.showHeader).isFalse()
		}

		@Test
		@DisableFlags(StatusBarForDesktop.FLAG_NAME)
		fun showHeader_desktopFeatureSetEnabled_statusBarForDesktopDisabled_true() =
		fun showHeader_desktopStatusBarEnabled_statusBarForDesktopDisabled_true() =
		kosmos.runTest {
		setEnableDesktopFeatureSet(true)
		setUseDesktopStatusBar(true)
		assertThat(underTest.showHeader).isTrue()
		}

		private fun Kosmos.setEnableDesktopFeatureSet(enable: Boolean) {
		private fun Kosmos.setUseDesktopStatusBar(enable: Boolean) {
		testableContext.orCreateTestableResources.addOverride(
		R.bool.config_enableDesktopFeatureSet,
		R.bool.config_useDesktopStatusBar,
		enable,
		)
		configurationController.onConfigurationChanged(Configuration())

packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/SceneContainerViewModelTest.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ import androidx.test.filters.SmallTest
		import com.android.compose.animation.scene.DefaultEdgeDetector
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.classifier.fakeFalsingManager
		import com.android.systemui.desktop.domain.interactor.enableDesktopFeatureSet
		import com.android.systemui.desktop.domain.interactor.enableUsingDesktopStatusBar
		import com.android.systemui.deviceentry.domain.interactor.deviceUnlockedInteractor
		import com.android.systemui.flags.EnableSceneContainer
		import com.android.systemui.keyguard.data.repository.fakeDeviceEntryFingerprintAuthRepository
		@@ -438,7 +438,7 @@ class SceneContainerViewModelTest : SysuiTestCase() {
		// GIVEN a device in desktop mode with dual shade enabled and an overlay present
		val currentOverlays by collectLastValue(sceneInteractor.currentOverlays)
		enableDualShade()
		enableDesktopFeatureSet()
		enableUsingDesktopStatusBar()
		sceneInteractor.showOverlay(Overlays.QuickSettingsShade, "test")
		assertThat(currentOverlays).isNotEmpty()

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ui/viewmodel/ShadeHeaderViewModelTest.kt

+16 −16

Original line number	Diff line number	Diff line
		@@ -75,9 +75,9 @@ class ShadeHeaderViewModelTest : SysuiTestCase() {
		}

		@Test
		fun onClockClicked_enableDesktopFeatureSetFalse_launchesClock() =
		fun onClockClicked_enableDesktopStatusBarFalse_launchesClock() =
		kosmos.runTest {
		setEnableDesktopFeatureSet(enable = false)
		setUseDesktopStatusBar(enable = false)
		underTest.onClockClicked()

		verify(activityStarter)
		@@ -88,9 +88,9 @@ class ShadeHeaderViewModelTest : SysuiTestCase() {
		}

		@Test
		fun onClockClicked_enableDesktopFeatureSetTrueAndSingleShade_launchesClock() =
		fun onClockClicked_enableDesktopStatusBarTrueAndSingleShade_launchesClock() =
		kosmos.runTest {
		setEnableDesktopFeatureSet(enable = true)
		setUseDesktopStatusBar(enable = true)
		enableSingleShade()

		underTest.onClockClicked()
		@@ -103,9 +103,9 @@ class ShadeHeaderViewModelTest : SysuiTestCase() {
		}

		@Test
		fun onClockClicked_enableDesktopFeatureSetTrueAndDualShade_openNotifShade() =
		fun onClockClicked_enableDesktopStatusBarTrueAndDualShade_openNotifShade() =
		kosmos.runTest {
		setEnableDesktopFeatureSet(enable = true)
		setUseDesktopStatusBar(enable = true)
		enableDualShade()
		setDeviceEntered(true)
		val currentScene by collectLastValue(sceneInteractor.currentScene)
		@@ -119,9 +119,9 @@ class ShadeHeaderViewModelTest : SysuiTestCase() {
		}

		@Test
		fun onClockClicked_enableDesktopFeatureSetTrueOnNotifShade_closesShade() =
		fun onClockClicked_enablesetDesktopStatusBarTrueOnNotifShade_closesShade() =
		kosmos.runTest {
		setEnableDesktopFeatureSet(enable = true)
		setUseDesktopStatusBar(enable = true)
		enableDualShade()
		setDeviceEntered(true)
		setOverlay(Overlays.NotificationsShade)
		@@ -135,9 +135,9 @@ class ShadeHeaderViewModelTest : SysuiTestCase() {
		}

		@Test
		fun onClockClicked_enableDesktopFeatureSetTrueOnQSShade_openNotifShade() =
		fun onClockClicked_enableDesktopStatusBarTrueOnQSShade_openNotifShade() =
		kosmos.runTest {
		setEnableDesktopFeatureSet(enable = true)
		setUseDesktopStatusBar(enable = true)
		enableDualShade()
		setDeviceEntered(true)
		setOverlay(Overlays.QuickSettingsShade)
		@@ -152,17 +152,17 @@ class ShadeHeaderViewModelTest : SysuiTestCase() {
		}

		@Test
		fun enableDesktopFeatureSetTrue_inactiveChipHighlightReturnsTransparent() =
		fun enableDesktopStatusBarTrue_inactiveChipHighlightReturnsTransparent() =
		kosmos.runTest {
		setEnableDesktopFeatureSet(enable = true)
		setUseDesktopStatusBar(enable = true)

		assertThat(underTest.inactiveChipHighlight).isEqualTo(ChipHighlightModel.Transparent)
		}

		@Test
		fun enableDesktopFeatureSetTrue_inactiveChipHighlightReturnsWeak() =
		fun enableDesktopStatusBarTrue_inactiveChipHighlightReturnsWeak() =
		kosmos.runTest {
		setEnableDesktopFeatureSet(enable = false)
		setUseDesktopStatusBar(enable = false)

		assertThat(underTest.inactiveChipHighlight).isEqualTo(ChipHighlightModel.Weak)
		}
		@@ -437,9 +437,9 @@ class ShadeHeaderViewModelTest : SysuiTestCase() {
		assertThat(deviceEntryInteractor.isDeviceEntered.value).isEqualTo(isEntered)
		}

		private fun Kosmos.setEnableDesktopFeatureSet(enable: Boolean) {
		private fun Kosmos.setUseDesktopStatusBar(enable: Boolean) {
		testableContext.orCreateTestableResources.addOverride(
		R.bool.config_enableDesktopFeatureSet,
		R.bool.config_useDesktopStatusBar,
		enable,
		)
		configurationController.onConfigurationChanged(Configuration())