PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a config for the face enroll introduction activity

Browse Source 
Test: manual

Bug: 185426108
Change-Id: I42e1f8dd5a20e8066fbd1374283acc1228427d45
This commit is contained in:
Curtis Belmonte
2021-04-14 17:39:02 -07:00
parent 7f0888a6a0
commit 91f88d6186
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/config.xml
View File

@@ -269,6 +269,11 @@
<!-- ComponentName to launch a vendor-specific enrollment activity if available --> <!-- ComponentName to launch a vendor-specific enrollment activity if available -->
<string name="config_face_enroll" translatable="false"></string> <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 --> <!-- App intent -->
<string name="config_account_intent_uri" translatable="false"></string> <string name="config_account_intent_uri" translatable="false"></string>

8
src/com/android/settings/biometrics/BiometricUtils.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.biometrics; package com.android.settings.biometrics;
import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
import android.app.Activity; import android.app.Activity;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyManager;
@@ -30,8 +32,8 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.SetupWizardUtils; 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.FingerprintEnrollFindSensor;
import com.android.settings.biometrics.fingerprint.FingerprintEnrollIntroduction; import com.android.settings.biometrics.fingerprint.FingerprintEnrollIntroduction;
import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollIntroduction; import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollIntroduction;
@@ -165,7 +167,9 @@ public class BiometricUtils {
*/ */
public static Intent getFaceIntroIntent(@NonNull Context context, public static Intent getFaceIntroIntent(@NonNull Context context,
@NonNull Intent activityIntent) { @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); WizardManagerHelper.copyWizardManagerExtras(activityIntent, intent);
return intent; return intent;
} }

2
src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java
View File

@@ -68,7 +68,7 @@ public class FaceStatusPreferenceController extends BiometricStatusPreferenceCon
@Override @Override
protected String getEnrollClassName() { protected String getEnrollClassName() {
return FaceEnrollIntroduction.class.getName(); return mContext.getResources().getString(R.string.config_face_enroll_introduction);
} }
} }