commit a5cdbee7b930cd97bc3ed8e89fcc7cc19491ea4d
author Yong Zhang <zhangyong@google.com> Wed Feb 01 00:52:55 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 01 00:52:55 2023 +0000
tree f817095a52a88d7d9aa70c2265eafe2ab527b923
parent 1e43f8f22d96b04c21b502368a3c668c8fed269f
parent f691b4302d03db221750cf702a653b1359c937ec

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 am: 6cb1a7ce5a am: f691b4302d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21135024

Change-Id: I45505e8c798e51b36b828f31d0b31046c0c8c0ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

diff --git a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
index 4f9b0fb..1e2a0c9 100644
--- a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
+++ b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
@@ -36,6 +36,7 @@
 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;
@@ -233,7 +234,7 @@
         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 */));