[flexi] Don't include Flexiglass if static flag is off.

This undoes the APK size bloat introduced by ag/24640909 where we
removed the use of Flags.SCENE_CONTAINER_ENABLED in
ShadeViewProviderModule which removed the ability of Proguard to cull
Flexiglass code when compiling.

Fix: 299199299
Test: presubmit shows BloatBuster is shows a smaller APK size.
Change-Id: Id481a7ebc4bf489fc56ba272797e7b0c57974f99

1 files changed, 1 insertions, 1 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewProviderModule.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewProviderModule.kt
index 3f7512a25732..f1e75b150271 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewProviderModule.kt
+++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewProviderModule.kt
@@ -76,7 +76,7 @@ abstract class ShadeViewProviderModule {
             scenesProvider: Provider<Set<@JvmSuppressWildcards Scene>>,
             layoutInsetController: NotificationInsetsController,
         ): WindowRootView {
-            return if (sceneContainerFlags.isEnabled()) {
+            return if (Flags.SCENE_CONTAINER_ENABLED && sceneContainerFlags.isEnabled()) {
                 val sceneWindowRootView =
                     layoutInflater.inflate(R.layout.scene_window_root, null) as SceneWindowRootView
                 sceneWindowRootView.init(