Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9707271d authored by Joseph Vincent's avatar Joseph Vincent Committed by Android (Google) Code Review
Browse files

Merge "Start PrivateSpaceDeleteActivity in full screen on foldables" into main

parents 410f699c 927e197d

src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java

+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import com.android.settings.homepage.SettingsHomepageActivity; 
import com.android.settings.overlay.FeatureFactory;

import com.android.settings.password.ChooseLockPattern;

import com.android.settings.privatespace.PrivateSpaceSetupActivity;

import com.android.settings.privatespace.delete.PrivateSpaceDeleteActivity;

import com.android.settings.remoteauth.RemoteAuthActivity;

import com.android.settings.remoteauth.RemoteAuthActivityInternal;
@@ -263,6 +264,9 @@ public class ActivityEmbeddingRulesController { 
        addActivityFilter(activityFilters, RemoteAuthActivityInternal.class);

        addActivityFilter(activityFilters, ChooseLockPattern.class);

        addActivityFilter(activityFilters, PrivateSpaceSetupActivity.class);

        if (android.multiuser.Flags.fixLargeDisplayPrivateSpaceSettings()) {

            addActivityFilter(activityFilters, PrivateSpaceDeleteActivity.class);

        }

        String action = mContext.getString(R.string.config_avatar_picker_action);

        addActivityFilter(activityFilters, new Intent(action));