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

Commit 6cb1a7ce authored by Yong Zhang's avatar Yong Zhang Committed by Android (Google) Code Review
Browse files

Merge "Adjust AlwaysExpand List so that face detail settings will show in side... 

Merge "Adjust AlwaysExpand List so that face detail settings will show in side panel while posture guidance will show full-screen" into tm-qpr-dev
parents 7e524288 b5e5100f

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

+2 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import androidx.window.embedding.SplitRule; 
import com.android.settings.Settings;

import com.android.settings.SettingsActivity;

import com.android.settings.SubSettings;

import com.android.settings.biometrics.face.FaceEnrollIntroduction;

import com.android.settings.biometrics.face.FaceEnrollIntroductionInternal;

import com.android.settings.biometrics.fingerprint.FingerprintEnrollEnrolling;

import com.android.settings.biometrics.fingerprint.FingerprintEnrollIntroduction;
@@ -231,7 +232,7 @@ public class ActivityEmbeddingRulesController { 
        addActivityFilter(activityFilters, FingerprintEnrollIntroductionInternal.class);

        addActivityFilter(activityFilters, FingerprintEnrollEnrolling.class);

        addActivityFilter(activityFilters, FaceEnrollIntroductionInternal.class);

        addActivityFilter(activityFilters, Settings.FaceSettingsInternalActivity.class);

        addActivityFilter(activityFilters, FaceEnrollIntroduction.class);

        addActivityFilter(activityFilters, AvatarPickerActivity.class);

        addActivityFilter(activityFilters, ChooseLockPattern.class);

        mSplitController.registerRule(new ActivityRule(activityFilters, true /* alwaysExpand */));