From b5e5100f9234f2375ffb0eab0df2d622876e89aa Mon Sep 17 00:00:00 2001 From: Chengfei Tao Date: Sun, 29 Jan 2023 13:22:40 +0800 Subject: [PATCH] Adjust AlwaysExpand List so that face detail settings will show in side panel while posture guidance will show full-screen Test: Manual testing with power cycle Bug: 263068723 Change-Id: I6d632d08dcb3597cd8470f8d3d34258e4280dc14 --- .../activityembedding/ActivityEmbeddingRulesController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java index 369f453fc1b..784c87fa3d0 100644 --- a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java +++ b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java @@ -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; @@ -230,7 +231,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); mSplitController.registerRule(new ActivityRule(activityFilters, true /* alwaysExpand */)); }