From 326d1390ca51d55ee87c0d0a498c31950269f5be Mon Sep 17 00:00:00 2001 From: Jordan Demeulenaere Date: Mon, 24 Jul 2023 14:44:40 +0200 Subject: Hide Flexiglass Compose code behind a constant Boolean flag This CL adds an additional SCENE_CONTAINER_ENABLED flag on top of the existing SCENE_CONTAINER flag that has to be flipped in source code when developping to enable Flexiglass. This is necessary so that we can enable our existing Compose features without paying the apk size cost of Flexiglass (see comments of http://ag/24151185 for details). Bug: 238993727 Test: Manual, checked the size of our userdebug APK with and without the flag. Change-Id: If9788a535a6f56b7f3aa44563d2c86e7c20bc687 --- packages/SystemUI/src/com/android/systemui/flags/Flags.kt | 6 ++++++ .../src/com/android/systemui/shade/ShadeViewProviderModule.kt | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index d8b31a229261..6fa1232d8a16 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 @@ object Flags { 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 diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewProviderModule.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewProviderModule.kt index 6585fcb1ae53..ed719a651978 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 @@ abstract class ShadeViewProviderModule { 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 -- cgit v1.2.3-59-g8ed1b From ab6b3738112fb9bbdd8265e94593385356f2a1da Mon Sep 17 00:00:00 2001 From: Jordan Demeulenaere Date: Mon, 7 Aug 2023 13:29:40 +0200 Subject: Enable the Compose implementation of the PeopleSpaceActivity Bug: 293570761 Test: Manual Change-Id: I5d32642c23b071b49f83afc45d0dc34be04c03e5 --- packages/SystemUI/src/com/android/systemui/flags/Flags.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index 6fa1232d8a16..30e79e2e1f6b 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -770,7 +770,7 @@ object Flags { /** 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 -- cgit v1.2.3-59-g8ed1b From d1379f587a163b14fd36ec537c37f6a8db2e930e Mon Sep 17 00:00:00 2001 From: Jordan Demeulenaere Date: Mon, 31 Jul 2023 16:45:11 +0200 Subject: Enable the Compose implementation of the QS footer actions Bug: 293569320 Test: Manual Change-Id: Ia5b206605d6b57439b7d5351807e162918cc9871 --- packages/SystemUI/src/com/android/systemui/flags/Flags.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index 30e79e2e1f6b..d8bc5ff75b61 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -774,7 +774,7 @@ object Flags { /** 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 -- cgit v1.2.3-59-g8ed1b