From: Kevin Chyn <kchyn@google.com>
Date: Fri, 21 Dec 2018 20:42:57 +0000 (-0800)
Subject: Add mechanism for vendor-specific enrollment
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=28ac88a73609f403ca05023dbf23b3c35e1bd313;p=android-x86%2Fpackages-apps-Settings.git

Add mechanism for vendor-specific enrollment

Bug: 111548033
Test: Builds
Change-Id: I1b87d40a584ea21c3de50651f880ce94ed7d40d7
---

diff --git a/res/values/config.xml b/res/values/config.xml
index 7108cbde50..82e185c837 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -168,4 +168,7 @@
 
     <!-- Uri that represents extra bluetooth settings -->
     <string name="config_bluetooth_device_settings_uri" translatable="false">content://com.google.android.gms.nearby.fastpair/settings_slice?addr=<xliff:g id="mac_address">%1$s</xliff:g></string>
+
+    <!-- ComponentName to launch a vendor-specific enrollment activity if available -->
+    <string name="config_face_enroll" translatable="false"></string>
 </resources>
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
index 1c36ea863b..a90cf5d924 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
@@ -17,9 +17,11 @@
 package com.android.settings.biometrics.face;
 
 import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
 import android.content.Intent;
 import android.hardware.face.FaceManager;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;
 import android.widget.LinearLayout;
@@ -156,7 +158,15 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
 
     @Override
     protected Intent getEnrollingIntent() {
-        final Intent intent = new Intent(this, FaceEnrollEnrolling.class);
+        final String flattenedString = getString(R.string.config_face_enroll);
+        final Intent intent = new Intent();
+        if (!TextUtils.isEmpty(flattenedString)) {
+            ComponentName componentName = ComponentName.unflattenFromString(flattenedString);
+            intent.setComponent(componentName);
+
+        } else {
+            intent.setClass(this, FaceEnrollEnrolling.class);
+        }
         intent.putExtra(EXTRA_KEY_REQUIRE_VISION, mSwitchVision.isChecked());
         intent.putExtra(EXTRA_KEY_REQUIRE_DIVERSITY, mSwitchDiversity.isChecked());
         return intent;