Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add the COMPOSE_PEOPLE_SPACE flag

Browse Source 
Bug: 293570761
Test: Manual
Change-Id: I48a1d3802d1aa95b9fa84a9094d5273fd3f5d926
This commit is contained in:
Jordan Demeulenaere
2023-07-28 13:04:48 +02:00
parent 7bcdf0c096
commit d07141aa62
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/flags/Flags.kt
View File

@@ -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")
}

10
packages/SystemUI/src/com/android/systemui/people/PeopleSpaceActivity.java
View File

@@ -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 {