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

Merge "Fix Delete face model button flicker"

Browse Source
This commit is contained in:
Vincent Wang
2022-07-22 04:17:43 +00:00
committed by Android (Google) Code Review
parent de6ed69527 65f53e98e3
commit 9937a51355
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -203,6 +203,10 @@ public class FaceSettings extends DashboardFragment {
if (savedInstanceState != null) { if (savedInstanceState != null) {
mToken = savedInstanceState.getByteArray(KEY_TOKEN); mToken = savedInstanceState.getByteArray(KEY_TOKEN);
} }
final boolean hasEnrolled = mFaceManager.hasEnrolledTemplates(mUserId);
mEnrollButton.setVisible(!hasEnrolled);
mRemoveButton.setVisible(hasEnrolled);
} }
@Override @Override
@@ -230,10 +234,6 @@ public class FaceSettings extends DashboardFragment {
mEnrollController.setToken(mToken); mEnrollController.setToken(mToken);
} }
final boolean hasEnrolled = mFaceManager.hasEnrolledTemplates(mUserId);
mEnrollButton.setVisible(!hasEnrolled);
mRemoveButton.setVisible(hasEnrolled);
if (!mFaceFeatureProvider.isAttentionSupported(getContext())) { if (!mFaceFeatureProvider.isAttentionSupported(getContext())) {
removePreference(FaceSettingsAttentionPreferenceController.KEY); removePreference(FaceSettingsAttentionPreferenceController.KEY);
} }
@@ -261,6 +261,10 @@ public class FaceSettings extends DashboardFragment {
mEnrollController.setToken(mToken); mEnrollController.setToken(mToken);
mConfirmingPassword = false; mConfirmingPassword = false;
}); });
final boolean hasEnrolled = mFaceManager.hasEnrolledTemplates(mUserId);
mEnrollButton.setVisible(!hasEnrolled);
mRemoveButton.setVisible(hasEnrolled);
} }
} else if (requestCode == ENROLL_REQUEST) { } else if (requestCode == ENROLL_REQUEST) {
if (resultCode == RESULT_TIMEOUT) { if (resultCode == RESULT_TIMEOUT) {