From d07141aa62325156565270cd259ed37ae7456fa8 Mon Sep 17 00:00:00 2001 From: Jordan Demeulenaere 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 From 28d6944b4b5f5e69c5aaae382ee6a1e5da14bfe0 Mon Sep 17 00:00:00 2001 From: Jordan Demeulenaere Date: Fri, 28 Jul 2023 13:06:35 +0200 Subject: Add the COMPOSE_QS_FOOTER_ACTIONS flag Bug: 293569320 Test: Manual Change-Id: I9025a0a345572811161d8834643eb70f7cfbd172 --- packages/SystemUI/src/com/android/systemui/flags/Flags.kt | 4 ++++ packages/SystemUI/src/com/android/systemui/qs/QSFragment.java | 4 +++- 2 files changed, 7 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 0f92b9ea36aa..9474c958637b 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -738,4 +738,8 @@ object Flags { /** Enable the Compose implementation of the PeopleSpaceActivity. */ @JvmField val COMPOSE_PEOPLE_SPACE = unreleasedFlag(293570761, "compose_people_space") + + /** Enable the Compose implementation of the Quick Settings footer actions. */ + @JvmField + val COMPOSE_QS_FOOTER_ACTIONS = unreleasedFlag(293569320, "compose_qs_footer_actions") } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java index 8d9475d9a53e..ddb395b6b598 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java @@ -52,6 +52,7 @@ import com.android.systemui.animation.ShadeInterpolation; import com.android.systemui.compose.ComposeFacade; import com.android.systemui.dump.DumpManager; import com.android.systemui.flags.FeatureFlags; +import com.android.systemui.flags.Flags; import com.android.systemui.media.controls.ui.MediaHost; import com.android.systemui.plugins.qs.QS; import com.android.systemui.plugins.qs.QSContainerController; @@ -285,7 +286,8 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca private void bindFooterActionsView(View root) { LinearLayout footerActionsView = root.findViewById(R.id.qs_footer_actions); - if (!ComposeFacade.INSTANCE.isComposeAvailable()) { + if (!mFeatureFlags.isEnabled(Flags.COMPOSE_QS_FOOTER_ACTIONS) + || !ComposeFacade.INSTANCE.isComposeAvailable()) { Log.d(TAG, "Binding the View implementation of the QS footer actions"); mFooterActionsViewBinder.bind(footerActionsView, mQSFooterActionsViewModel, mListeningAndVisibilityLifecycleOwner); -- cgit v1.2.3-59-g8ed1b