From d07141aa62325156565270cd259ed37ae7456fa8 Mon Sep 17 00:00:00 2001
From: Jordan Demeulenaere <jdemeulenaere@google.com>
Date: Fri, 28 Jul 2023 13:04:48 +0200
Subject: Add the COMPOSE_PEOPLE_SPACE flag

Bug: 293570761
Test: Manual
Change-Id: I48a1d3802d1aa95b9fa84a9094d5273fd3f5d926
---
 packages/SystemUI/src/com/android/systemui/flags/Flags.kt      |  4 ++++
 .../src/com/android/systemui/people/PeopleSpaceActivity.java   | 10 ++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
index b04d9705f857..0f92b9ea36aa 100644
--- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
+++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
@@ -734,4 +734,8 @@ object Flags {
     // TODO(b/290213663): Tracking Bug
     @JvmField
     val ONE_WAY_HAPTICS_API_MIGRATION = unreleasedFlag(3100, "oneway_haptics_api_migration")
+
+    /** Enable the Compose implementation of the PeopleSpaceActivity. */
+    @JvmField
+    val COMPOSE_PEOPLE_SPACE = unreleasedFlag(293570761, "compose_people_space")
 }
diff --git a/packages/SystemUI/src/com/android/systemui/people/PeopleSpaceActivity.java b/packages/SystemUI/src/com/android/systemui/people/PeopleSpaceActivity.java
index 7f0f89415280..d1d3e3de39f0 100644
--- a/packages/SystemUI/src/com/android/systemui/people/PeopleSpaceActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/people/PeopleSpaceActivity.java
@@ -28,6 +28,8 @@ import androidx.activity.ComponentActivity;
 import androidx.lifecycle.ViewModelProvider;
 
 import com.android.systemui.compose.ComposeFacade;
+import com.android.systemui.flags.FeatureFlags;
+import com.android.systemui.flags.Flags;
 import com.android.systemui.people.ui.view.PeopleViewBinder;
 import com.android.systemui.people.ui.viewmodel.PeopleViewModel;
 
@@ -43,11 +45,14 @@ public class PeopleSpaceActivity extends ComponentActivity {
     private static final boolean DEBUG = PeopleSpaceUtils.DEBUG;
 
     private final PeopleViewModel.Factory mViewModelFactory;
+    private final FeatureFlags mFeatureFlags;
 
     @Inject
-    public PeopleSpaceActivity(PeopleViewModel.Factory viewModelFactory) {
+    public PeopleSpaceActivity(PeopleViewModel.Factory viewModelFactory,
+            FeatureFlags featureFlags) {
         super();
         mViewModelFactory = viewModelFactory;
+        mFeatureFlags = featureFlags;
     }
 
     @Override
@@ -67,7 +72,8 @@ public class PeopleSpaceActivity extends ComponentActivity {
             return null;
         };
 
-        if (ComposeFacade.INSTANCE.isComposeAvailable()) {
+        if (mFeatureFlags.isEnabled(Flags.COMPOSE_PEOPLE_SPACE)
+                && ComposeFacade.INSTANCE.isComposeAvailable()) {
             Log.d(TAG, "Using the Compose implementation of the PeopleSpaceActivity");
             ComposeFacade.INSTANCE.setPeopleSpaceActivityContent(this, viewModel, onResult);
         } else {
-- 
cgit v1.2.3-59-g8ed1b