From 91f88d6186c313b131ab1ce0be5b8f29c21d16ef Mon Sep 17 00:00:00 2001
From: Curtis Belmonte <curtislb@google.com>
Date: Wed, 14 Apr 2021 17:39:02 -0700
Subject: [PATCH] Add a config for the face enroll introduction activity

Test: manual

Bug: 185426108
Change-Id: I42e1f8dd5a20e8066fbd1374283acc1228427d45
---
 res/values/config.xml                                     | 5 +++++
 src/com/android/settings/biometrics/BiometricUtils.java   | 8 ++++++--
 .../biometrics/face/FaceStatusPreferenceController.java   | 2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/res/values/config.xml b/res/values/config.xml
index 5a8f6363efb..a41e41b96f7 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -269,6 +269,11 @@
     <!-- ComponentName to launch a vendor-specific enrollment activity if available -->
     <string name="config_face_enroll" translatable="false"></string>
 
+    <!-- Fully qualified name of the introductory activity for face enrollment. -->
+    <string name="config_face_enroll_introduction" translatable="false">
+        com.android.settings.biometrics.face.FaceEnrollIntroduction
+    </string>
+
     <!-- App intent -->
     <string name="config_account_intent_uri" translatable="false"></string>
 
diff --git a/src/com/android/settings/biometrics/BiometricUtils.java b/src/com/android/settings/biometrics/BiometricUtils.java
index f338eb592b1..4f13d0cc484 100644
--- a/src/com/android/settings/biometrics/BiometricUtils.java
+++ b/src/com/android/settings/biometrics/BiometricUtils.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.biometrics;
 
+import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
+
 import android.app.Activity;
 import android.app.PendingIntent;
 import android.app.admin.DevicePolicyManager;
@@ -30,8 +32,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.R;
 import com.android.settings.SetupWizardUtils;
-import com.android.settings.biometrics.face.FaceEnrollIntroduction;
 import com.android.settings.biometrics.fingerprint.FingerprintEnrollFindSensor;
 import com.android.settings.biometrics.fingerprint.FingerprintEnrollIntroduction;
 import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollIntroduction;
@@ -165,7 +167,9 @@ public class BiometricUtils {
      */
     public static Intent getFaceIntroIntent(@NonNull Context context,
             @NonNull Intent activityIntent) {
-        Intent intent = new Intent(context, FaceEnrollIntroduction.class);
+        final String className = context.getString(R.string.config_face_enroll_introduction);
+        Intent intent = new Intent();
+        intent.setClassName(SETTINGS_PACKAGE_NAME, className);
         WizardManagerHelper.copyWizardManagerExtras(activityIntent, intent);
         return intent;
     }
diff --git a/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java b/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java
index 648da9b6ef7..94651d754ac 100644
--- a/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java
+++ b/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java
@@ -68,7 +68,7 @@ public class FaceStatusPreferenceController extends BiometricStatusPreferenceCon
 
     @Override
     protected String getEnrollClassName() {
-        return FaceEnrollIntroduction.class.getName();
+        return mContext.getResources().getString(R.string.config_face_enroll_introduction);
     }
 
 }