Merge changes from topic "cherrypicker-L27500000962600793:N19100001397012006" into main
* changes:
Enable the Compose implementation of the QS footer actions
Enable the Compose implementation of the PeopleSpaceActivity
Hide Flexiglass Compose code behind a constant Boolean flag
diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
index d8b31a2..d8bc5ff 100644
--- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
+++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
@@ -636,7 +636,13 @@
val CLIPBOARD_SHARED_TRANSITIONS =
unreleasedFlag("clipboard_shared_transitions", teamfood = true)
+ /**
+ * Whether the scene container (Flexiglass) is enabled. Note that [SCENE_CONTAINER] should be
+ * checked and toggled together with [SCENE_CONTAINER_ENABLED] so that ProGuard can remove
+ * unused code from our APK at compile time.
+ */
// TODO(b/283300105): Tracking Bug
+ @JvmField val SCENE_CONTAINER_ENABLED = false
@JvmField val SCENE_CONTAINER = unreleasedFlag("scene_container")
// 1900
@@ -764,11 +770,11 @@
/** Enable the Compose implementation of the PeopleSpaceActivity. */
@JvmField
- val COMPOSE_PEOPLE_SPACE = unreleasedFlag("compose_people_space")
+ val COMPOSE_PEOPLE_SPACE = releasedFlag("compose_people_space")
/** Enable the Compose implementation of the Quick Settings footer actions. */
@JvmField
- val COMPOSE_QS_FOOTER_ACTIONS = unreleasedFlag("compose_qs_footer_actions")
+ val COMPOSE_QS_FOOTER_ACTIONS = releasedFlag("compose_qs_footer_actions")
/** Enable the share wifi button in Quick Settings internet dialog. */
@JvmField
diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewProviderModule.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewProviderModule.kt
index 6585fcb..ed719a65 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewProviderModule.kt
+++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewProviderModule.kt
@@ -77,7 +77,9 @@
layoutInsetController: NotificationInsetsController,
): WindowRootView {
return if (
- featureFlags.isEnabled(Flags.SCENE_CONTAINER) && ComposeFacade.isComposeAvailable()
+ Flags.SCENE_CONTAINER_ENABLED &&
+ featureFlags.isEnabled(Flags.SCENE_CONTAINER) &&
+ ComposeFacade.isComposeAvailable()
) {
val sceneWindowRootView =
layoutInflater.inflate(R.layout.scene_window_root, null) as SceneWindowRootView