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

Merge "Add a config for the face enroll introduction activity" into sc-dev

Browse Source
This commit is contained in:
Curtis Belmonte
2021-04-16 00:13:13 +00:00
committed by Android (Google) Code Review
parent 6840ead634 91f88d6186
commit 025bb7cab5
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}

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

@@ -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);
}
}