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

Merge "(2/2) Fix No clear steps for "re-enroll face unlock" into udc-dev

Browse Source
This commit is contained in:
Jason Chang
2023-03-02 16:24:16 +00:00
committed by Android (Google) Code Review
parent 98819227f1 c3fae47144
commit a441922bdd
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/biometrics/face/FaceSettings.java
View File

@@ -33,6 +33,7 @@ import android.os.Bundle;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.util.Log; import android.util.Log;
import android.widget.Button;
import androidx.preference.Preference; import androidx.preference.Preference;
@@ -47,6 +48,7 @@ import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.search.SearchIndexable;
import com.android.settingslib.widget.LayoutPreference;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@@ -60,6 +62,7 @@ public class FaceSettings extends DashboardFragment {
private static final String TAG = "FaceSettings"; private static final String TAG = "FaceSettings";
private static final String KEY_TOKEN = "hw_auth_token"; private static final String KEY_TOKEN = "hw_auth_token";
private static final String KEY_RE_ENROLL_FACE = "re_enroll_face_unlock";
private static final String PREF_KEY_DELETE_FACE_DATA = private static final String PREF_KEY_DELETE_FACE_DATA =
"security_settings_face_delete_faces_container"; "security_settings_face_delete_faces_container";
@@ -211,6 +214,20 @@ public class FaceSettings extends DashboardFragment {
final boolean hasEnrolled = mFaceManager.hasEnrolledTemplates(mUserId); final boolean hasEnrolled = mFaceManager.hasEnrolledTemplates(mUserId);
mEnrollButton.setVisible(!hasEnrolled); mEnrollButton.setVisible(!hasEnrolled);
mRemoveButton.setVisible(hasEnrolled); mRemoveButton.setVisible(hasEnrolled);
// When the user has face id registered but failed enrolling in device lock state,
// lead users directly to the confirm deletion dialog in Face Unlock settings.
if (hasEnrolled) {
final boolean isReEnrollFaceUnlock = getIntent().getBooleanExtra(
FaceSettings.KEY_RE_ENROLL_FACE, false);
if (isReEnrollFaceUnlock) {
final Button removeBtn = ((LayoutPreference) mRemoveButton).findViewById(
R.id.security_settings_face_settings_remove_button);
if (removeBtn != null && removeBtn.isEnabled()) {
mRemoveController.onClick(removeBtn);
}
}
}
} }
@Override @Override