Merge changes from topic "am-d3425663ccd1495aa73fff4f0bb394be" into main
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: fb9930eb6c -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c5849b864 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: d23b2221f2 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 50aeec824b -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 5c501d654a -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf73c3e34e -s ours
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java b/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java
index da3689a..32d2a11 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java
@@ -17,10 +17,12 @@
package com.android.settings.biometrics.face;
import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FACE;
+import static android.hardware.biometrics.BiometricFaceConstants.FACE_ERROR_TIMEOUT;
+import static android.hardware.biometrics.BiometricFaceConstants.FEATURE_REQUIRE_ATTENTION;
+import static android.hardware.biometrics.BiometricFaceConstants.FEATURE_REQUIRE_REQUIRE_DIVERSITY;
import android.app.settings.SettingsEnums;
import android.content.Intent;
-import android.hardware.face.FaceManager;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
@@ -112,10 +114,10 @@
);
if (!getIntent().getBooleanExtra(BiometricEnrollBase.EXTRA_KEY_REQUIRE_DIVERSITY, true)) {
- mDisabledFeatures.add(FaceManager.FEATURE_REQUIRE_REQUIRE_DIVERSITY);
+ mDisabledFeatures.add(FEATURE_REQUIRE_REQUIRE_DIVERSITY);
}
if (!getIntent().getBooleanExtra(BiometricEnrollBase.EXTRA_KEY_REQUIRE_VISION, true)) {
- mDisabledFeatures.add(FaceManager.FEATURE_REQUIRE_ATTENTION);
+ mDisabledFeatures.add(FEATURE_REQUIRE_ATTENTION);
}
startEnrollment();
@@ -190,7 +192,7 @@
public void onEnrollmentError(int errMsgId, CharSequence errString) {
int msgId;
switch (errMsgId) {
- case FaceManager.FACE_ERROR_TIMEOUT:
+ case FACE_ERROR_TIMEOUT:
msgId = R.string.security_settings_face_enroll_error_timeout_dialog_message;
break;
default:
diff --git a/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java
index b5e9908..1902bc4 100644
--- a/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java
+++ b/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java
@@ -16,6 +16,8 @@
package com.android.settings.biometrics.face;
+import static android.hardware.biometrics.BiometricFaceConstants.FEATURE_REQUIRE_ATTENTION;
+
import android.content.Context;
import android.hardware.face.FaceManager;
import android.hardware.face.FaceManager.GetFeatureCallback;
@@ -42,7 +44,7 @@
private final SetFeatureCallback mSetFeatureCallback = new SetFeatureCallback() {
@Override
public void onCompleted(boolean success, int feature) {
- if (feature == FaceManager.FEATURE_REQUIRE_ATTENTION) {
+ if (feature == FEATURE_REQUIRE_ATTENTION) {
mPreference.setEnabled(true);
if (!success) {
mPreference.setChecked(!mPreference.isChecked());
@@ -60,7 +62,7 @@
public void onCompleted(boolean success, int[] features, boolean[] featureState) {
boolean requireAttentionEnabled = false;
for (int i = 0; i < features.length; i++) {
- if (features[i] == FaceManager.FEATURE_REQUIRE_ATTENTION) {
+ if (features[i] == FEATURE_REQUIRE_ATTENTION) {
requireAttentionEnabled = featureState[i];
}
}
@@ -98,7 +100,7 @@
}
// Set to disabled until we know the true value.
mPreference.setEnabled(false);
- mFaceManager.getFeature(getUserId(), FaceManager.FEATURE_REQUIRE_ATTENTION,
+ mFaceManager.getFeature(getUserId(), FEATURE_REQUIRE_ATTENTION,
mGetFeatureCallback);
// Ideally returns a cached value.
@@ -111,8 +113,8 @@
mPreference.setEnabled(false);
mPreference.setChecked(isChecked);
- mFaceManager.setFeature(getUserId(), FaceManager.FEATURE_REQUIRE_ATTENTION, isChecked,
- mToken, mSetFeatureCallback);
+ mFaceManager.setFeature(getUserId(), FEATURE_REQUIRE_ATTENTION,
+ isChecked, mToken, mSetFeatureCallback);
return true;
}