Merge "Letterbox status bar treatment - Remove dev feature flag" into tm-qpr-dev (f001142e) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −3

Original line number	Diff line number	Diff line
		@@ -162,9 +162,6 @@ object Flags {
		// TODO(b/254513246): Tracking Bug
		val STATUS_BAR_USER_SWITCHER = ResourceBooleanFlag(602, R.bool.flag_user_switcher_chip)

		// TODO(b/254513025): Tracking Bug
		val STATUS_BAR_LETTERBOX_APPEARANCE = ReleasedFlag(603, teamfood = false)

		// TODO(b/254512623): Tracking Bug
		@Deprecated("Replaced by mobile and wifi specific flags.")
		val NEW_STATUS_BAR_PIPELINE_BACKEND = UnreleasedFlag(604, teamfood = false)

packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemBarAttributesListener.kt

+1 −8

Original line number	Diff line number	Diff line
		@@ -22,8 +22,6 @@ import android.view.WindowInsetsController.Behavior
		import com.android.internal.statusbar.LetterboxDetails
		import com.android.internal.view.AppearanceRegion
		import com.android.systemui.dump.DumpManager
		import com.android.systemui.flags.FeatureFlags
		import com.android.systemui.flags.Flags
		import com.android.systemui.statusbar.SysuiStatusBarStateController
		import com.android.systemui.statusbar.phone.dagger.CentralSurfacesComponent
		import com.android.systemui.statusbar.phone.dagger.CentralSurfacesComponent.CentralSurfacesScope
		@@ -42,7 +40,6 @@ class SystemBarAttributesListener
		@Inject
		internal constructor(
		private val centralSurfaces: CentralSurfaces,
		private val featureFlags: FeatureFlags,
		private val letterboxAppearanceCalculator: LetterboxAppearanceCalculator,
		private val statusBarStateController: SysuiStatusBarStateController,
		private val lightBarController: LightBarController,
		@@ -127,15 +124,11 @@ internal constructor(
		}

		private fun shouldUseLetterboxAppearance(letterboxDetails: Array<LetterboxDetails>) =
		isLetterboxAppearanceFlagEnabled() && letterboxDetails.isNotEmpty()

		private fun isLetterboxAppearanceFlagEnabled() =
		featureFlags.isEnabled(Flags.STATUS_BAR_LETTERBOX_APPEARANCE)
		letterboxDetails.isNotEmpty()

		private fun dump(printWriter: PrintWriter, strings: Array<String>) {
		printWriter.println("lastSystemBarAttributesParams: $lastSystemBarAttributesParams")
		printWriter.println("lastLetterboxAppearance: $lastLetterboxAppearance")
		printWriter.println("letterbox appearance flag: ${isLetterboxAppearanceFlagEnabled()}")
		}
		}

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/SystemBarAttributesListenerTest.kt

+4 −31

Original line number	Diff line number	Diff line
		@@ -14,8 +14,6 @@ import com.android.internal.statusbar.LetterboxDetails
		import com.android.internal.view.AppearanceRegion
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.dump.DumpManager
		import com.android.systemui.flags.FeatureFlags
		import com.android.systemui.flags.Flags
		import com.android.systemui.statusbar.SysuiStatusBarStateController
		import org.junit.Before
		import org.junit.Test
		@@ -40,7 +38,6 @@ class SystemBarAttributesListenerTest : SysuiTestCase() {
		@Mock private lateinit var lightBarController: LightBarController
		@Mock private lateinit var statusBarStateController: SysuiStatusBarStateController
		@Mock private lateinit var letterboxAppearanceCalculator: LetterboxAppearanceCalculator
		@Mock private lateinit var featureFlags: FeatureFlags
		@Mock private lateinit var centralSurfaces: CentralSurfaces

		private lateinit var sysBarAttrsListener: SystemBarAttributesListener
		@@ -57,7 +54,6 @@ class SystemBarAttributesListenerTest : SysuiTestCase() {
		sysBarAttrsListener =
		SystemBarAttributesListener(
		centralSurfaces,
		featureFlags,
		letterboxAppearanceCalculator,
		statusBarStateController,
		lightBarController,
		@@ -74,18 +70,14 @@ class SystemBarAttributesListenerTest : SysuiTestCase() {
		}

		@Test
		fun onSysBarAttrsChanged_flagTrue_forwardsLetterboxAppearanceToCentralSurfaces() {
		whenever(featureFlags.isEnabled(Flags.STATUS_BAR_LETTERBOX_APPEARANCE)).thenReturn(true)

		fun onSysBarAttrsChanged_forwardsLetterboxAppearanceToCentralSurfaces() {
		changeSysBarAttrs(TEST_APPEARANCE, TEST_LETTERBOX_DETAILS)

		verify(centralSurfaces).setAppearance(TEST_LETTERBOX_APPEARANCE.appearance)
		}

		@Test
		fun onSysBarAttrsChanged_flagTrue_noLetterbox_forwardsOriginalAppearanceToCtrlSrfcs() {
		whenever(featureFlags.isEnabled(Flags.STATUS_BAR_LETTERBOX_APPEARANCE)).thenReturn(true)

		fun onSysBarAttrsChanged_noLetterbox_forwardsOriginalAppearanceToCtrlSrfcs() {
		changeSysBarAttrs(TEST_APPEARANCE, arrayOf<LetterboxDetails>())

		verify(centralSurfaces).setAppearance(TEST_APPEARANCE)
		@@ -100,9 +92,7 @@ class SystemBarAttributesListenerTest : SysuiTestCase() {
		}

		@Test
		fun onSysBarAttrsChanged_flagTrue_forwardsLetterboxAppearanceToStatusBarStateCtrl() {
		whenever(featureFlags.isEnabled(Flags.STATUS_BAR_LETTERBOX_APPEARANCE)).thenReturn(true)

		fun onSysBarAttrsChanged_forwardsLetterboxAppearanceToStatusBarStateCtrl() {
		changeSysBarAttrs(TEST_APPEARANCE, TEST_LETTERBOX_DETAILS)

		verify(statusBarStateController)
		@@ -120,9 +110,7 @@ class SystemBarAttributesListenerTest : SysuiTestCase() {
		}

		@Test
		fun onSysBarAttrsChanged_flagTrue_forwardsLetterboxAppearanceToLightBarController() {
		whenever(featureFlags.isEnabled(Flags.STATUS_BAR_LETTERBOX_APPEARANCE)).thenReturn(true)

		fun onSysBarAttrsChanged_forwardsLetterboxAppearanceToLightBarController() {
		changeSysBarAttrs(TEST_APPEARANCE, TEST_APPEARANCE_REGIONS, TEST_LETTERBOX_DETAILS)

		verify(lightBarController)
		@@ -135,7 +123,6 @@ class SystemBarAttributesListenerTest : SysuiTestCase() {

		@Test
		fun onStatusBarBoundsChanged_forwardsLetterboxAppearanceToStatusBarStateController() {
		whenever(featureFlags.isEnabled(Flags.STATUS_BAR_LETTERBOX_APPEARANCE)).thenReturn(true)
		changeSysBarAttrs(TEST_APPEARANCE, TEST_APPEARANCE_REGIONS, TEST_LETTERBOX_DETAILS)
		reset(centralSurfaces, lightBarController, statusBarStateController)

		@@ -148,7 +135,6 @@ class SystemBarAttributesListenerTest : SysuiTestCase() {

		@Test
		fun onStatusBarBoundsChanged_forwardsLetterboxAppearanceToLightBarController() {
		whenever(featureFlags.isEnabled(Flags.STATUS_BAR_LETTERBOX_APPEARANCE)).thenReturn(true)
		changeSysBarAttrs(TEST_APPEARANCE, TEST_APPEARANCE_REGIONS, TEST_LETTERBOX_DETAILS)
		reset(centralSurfaces, lightBarController, statusBarStateController)

		@@ -164,7 +150,6 @@ class SystemBarAttributesListenerTest : SysuiTestCase() {

		@Test
		fun onStatusBarBoundsChanged_forwardsLetterboxAppearanceToCentralSurfaces() {
		whenever(featureFlags.isEnabled(Flags.STATUS_BAR_LETTERBOX_APPEARANCE)).thenReturn(true)
		changeSysBarAttrs(TEST_APPEARANCE, TEST_APPEARANCE_REGIONS, TEST_LETTERBOX_DETAILS)
		reset(centralSurfaces, lightBarController, statusBarStateController)

		@@ -175,7 +160,6 @@ class SystemBarAttributesListenerTest : SysuiTestCase() {

		@Test
		fun onStatusBarBoundsChanged_previousCallEmptyLetterbox_doesNothing() {
		whenever(featureFlags.isEnabled(Flags.STATUS_BAR_LETTERBOX_APPEARANCE)).thenReturn(true)
		changeSysBarAttrs(TEST_APPEARANCE, TEST_APPEARANCE_REGIONS, arrayOf())
		reset(centralSurfaces, lightBarController, statusBarStateController)

		@@ -184,17 +168,6 @@ class SystemBarAttributesListenerTest : SysuiTestCase() {
		verifyZeroInteractions(centralSurfaces, lightBarController, statusBarStateController)
		}

		@Test
		fun onStatusBarBoundsChanged_flagFalse_doesNothing() {
		whenever(featureFlags.isEnabled(Flags.STATUS_BAR_LETTERBOX_APPEARANCE)).thenReturn(false)
		changeSysBarAttrs(TEST_APPEARANCE, TEST_APPEARANCE_REGIONS, TEST_LETTERBOX_DETAILS)
		reset(centralSurfaces, lightBarController, statusBarStateController)

		sysBarAttrsListener.onStatusBarBoundsChanged()

		verifyZeroInteractions(centralSurfaces, lightBarController, statusBarStateController)
		}

		private fun changeSysBarAttrs(@Appearance appearance: Int) {
		changeSysBarAttrs(appearance, arrayOf<LetterboxDetails>())
		}