Merge "[SB][Flexi] Replace MIGRATE_KEYGUARD_SB_VIEW with SceneContainerFlag" into main (50654fca) · Commits · e / os / android_frameworks_base

packages/SystemUI/docs/scene.md

+13 −11

Original line number	Diff line number	Diff line
		@@ -65,23 +65,25 @@ framework, please make sure `SceneContainerFlag.isEnabled` in the
		[`SceneContainerFlags.kt`](https://cs.android.com/android/platform/superproject/main/+/main:frameworks/base/packages/SystemUI/src/com/android/systemui/scene/shared/flag/SceneContainerFlags.kt)
		file evalutes to `true`.

		1. Set the `migrate_keyguard_status_bar_view` classic flag to `true` by
		running: `console $ adb shell statusbar cmd migrate_keyguard_status_bar_view
		true`
		2. Set a collection of aconfig flags to `true` by running the following
		1. Set a collection of aconfig flags to `true` by running the following
		commands:
		```console
		$ adb shell device_config put systemui com.android.systemui.scene_container true
		$ adb shell device_config put systemui com.android.systemui.compose_lockscreen true
		$ adb shell device_config put systemui com.android.systemui.keyguard_bottom_area_refactor true
		$ adb shell device_config put systemui com.android.systemui.media_in_scene_container true
		$ adb shell device_config put systemui com.android.systemui.migrate_clocks_to_blueprint true
		$ adb shell device_config override systemui com.android.systemui.scene_container true
		$ adb shell device_config override systemui com.android.systemui.compose_lockscreen true
		$ adb shell device_config override systemui com.android.systemui.keyguard_bottom_area_refactor true
		$ adb shell device_config override systemui com.android.systemui.keyguard_wm_state_refactor true
		$ adb shell device_config override systemui com.android.systemui.media_in_scene_container true
		$ adb shell device_config override systemui com.android.systemui.migrate_clocks_to_blueprint true
		$ adb shell device_config override systemui com.android.systemui.notification_heads_up_refactor true
		$ adb shell device_config override systemui com.android.systemui.predictive_back_sysui true
		$ adb shell device_config override systemui com.android.systemui.device_entry_udfps_refactor true
		$ adb shell device_config override systemui com.android.systemui.refactor_keyguard_dismiss_intent true
		```
		3. Restart System UI by issuing the following command:
		2. Restart System UI by issuing the following command:
		```console
		$ adb shell am crash com.android.systemui
		```
		4. Verify that the scene framework was turned on. There are two ways to do
		3. Verify that the scene framework was turned on. There are two ways to do
		this:

		(a) look for the sash/ribbon UI at the bottom-right corner of the display:

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import com.android.server.notification.Flags.vibrateWhileUnlocked
		import com.android.systemui.Flags.FLAG_COMMUNAL_HUB
		import com.android.systemui.Flags.communalHub
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.flags.Flags.MIGRATE_KEYGUARD_STATUS_BAR_VIEW
		import com.android.systemui.keyguard.KeyguardBottomAreaRefactor
		import com.android.systemui.keyguard.MigrateClocksToBlueprint
		import com.android.systemui.keyguard.shared.ComposeLockscreen
		@@ -53,7 +52,6 @@ class FlagDependencies @Inject constructor(featureFlags: FeatureFlagsClassic, ha

		// SceneContainer dependencies
		SceneContainerFlag.getFlagDependencies().forEach { (alpha, beta) -> alpha dependsOn beta }
		SceneContainerFlag.getMainAconfigFlag() dependsOn MIGRATE_KEYGUARD_STATUS_BAR_VIEW

		// ComposeLockscreen dependencies
		ComposeLockscreen.token dependsOn KeyguardBottomAreaRefactor.token

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

+0 −5

Original line number	Diff line number	Diff line
		@@ -183,11 +183,6 @@ object Flags {
		// TODO(b/287268101): Tracking bug.
		@JvmField val TRANSIT_CLOCK = releasedFlag("lockscreen_custom_transit_clock")

		/** Migrate the status bar view on keyguard from notification panel to keyguard root view. */
		// TODO(b/299115332): Tracking Bug.
		@JvmField val MIGRATE_KEYGUARD_STATUS_BAR_VIEW =
		unreleasedFlag("migrate_keyguard_status_bar_view")

		/** Enables preview loading animation in the wallpaper picker. */
		// TODO(b/274443705): Tracking Bug
		@JvmField

packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultStatusBarSection.kt

+4 −6

Original line number	Diff line number	Diff line
		@@ -27,10 +27,9 @@ import androidx.constraintlayout.widget.ConstraintSet.PARENT_ID
		import androidx.constraintlayout.widget.ConstraintSet.START
		import androidx.constraintlayout.widget.ConstraintSet.TOP
		import com.android.keyguard.dagger.KeyguardStatusBarViewComponent
		import com.android.systemui.res.R
		import com.android.systemui.flags.FeatureFlags
		import com.android.systemui.flags.Flags
		import com.android.systemui.keyguard.shared.model.KeyguardSection
		import com.android.systemui.res.R
		import com.android.systemui.scene.shared.flag.SceneContainerFlag
		import com.android.systemui.shade.NotificationPanelView
		import com.android.systemui.shade.ShadeViewStateProvider
		import com.android.systemui.statusbar.phone.KeyguardStatusBarView
		@@ -42,7 +41,6 @@ class DefaultStatusBarSection
		@Inject
		constructor(
		private val context: Context,
		private val featureFlags: FeatureFlags,
		private val notificationPanelView: NotificationPanelView,
		private val keyguardStatusBarViewComponentFactory: KeyguardStatusBarViewComponent.Factory,
		) : KeyguardSection() {
		@@ -50,7 +48,7 @@ constructor(
		private val statusBarViewId = R.id.keyguard_header

		override fun addViews(constraintLayout: ConstraintLayout) {
		if (!featureFlags.isEnabled(Flags.MIGRATE_KEYGUARD_STATUS_BAR_VIEW)) {
		if (!SceneContainerFlag.isEnabled) {
		return
		}

		@@ -67,7 +65,7 @@ constructor(
		}

		override fun bindData(constraintLayout: ConstraintLayout) {
		if (!featureFlags.isEnabled(Flags.MIGRATE_KEYGUARD_STATUS_BAR_VIEW)) {
		if (!SceneContainerFlag.isEnabled) {
		return
		}

packages/SystemUI/src/com/android/systemui/shade/ShadeViewController.kt

+2 −4

Original line number	Diff line number	Diff line
		@@ -177,8 +177,7 @@ interface ShadeFoldAnimator {
		@Deprecated("This interface should not be used in scene container.")
		interface ShadeViewStateProvider {
		/** Returns the expanded height of the panel view. */
		@Deprecated("deprecated by migrate_keyguard_status_bar_view flag")
		val panelViewExpandedHeight: Float
		@Deprecated("deprecated by SceneContainerFlag.isEnabled") val panelViewExpandedHeight: Float

		/**
		* Returns true if heads up should be visible.
		@@ -189,6 +188,5 @@ interface ShadeViewStateProvider {
		@Deprecated("deprecated in Flexiglass.") fun shouldHeadsUpBeVisible(): Boolean

		/** Return the fraction of the shade that's expanded, when in lockscreen. */
		@Deprecated("deprecated by migrate_keyguard_status_bar_view flag")
		val lockscreenShadeDragProgress: Float
		@Deprecated("deprecated by SceneContainerFlag.isEnabled") val lockscreenShadeDragProgress: Float
		}