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

Merge "Dismiss dialog on acquire message event."

Browse Source
This commit is contained in:
Joshua Mccloskey
2023-02-15 23:22:25 +00:00
committed by Android (Google) Code Review
parent e82fc16e88 00a2136ffa
commit cba4cbe23a
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
View File

@@ -106,6 +106,7 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
private static final String TAG = "FingerprintEnrollEnrolling"; private static final String TAG = "FingerprintEnrollEnrolling";
static final String TAG_SIDECAR = "sidecar"; static final String TAG_SIDECAR = "sidecar";
static final String TAG_UDFPS_HELPER = "udfps_helper"; static final String TAG_UDFPS_HELPER = "udfps_helper";
static final String ICON_TOUCH_DIALOG = "fps_icon_touch_dialog";
static final String KEY_STATE_CANCELED = "is_canceled"; static final String KEY_STATE_CANCELED = "is_canceled";
static final String KEY_STATE_PREVIOUS_ROTATION = "previous_rotation"; static final String KEY_STATE_PREVIOUS_ROTATION = "previous_rotation";
@@ -868,11 +869,14 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
if (mUdfpsEnrollHelper != null) mUdfpsEnrollHelper.onEnrollmentHelp(); if (mUdfpsEnrollHelper != null) mUdfpsEnrollHelper.onEnrollmentHelp();
} }
dismissTouchDialogIfSfps();
} }
@Override @Override
public void onEnrollmentError(int errMsgId, CharSequence errString) { public void onEnrollmentError(int errMsgId, CharSequence errString) {
onCancelEnrollment(errMsgId); onCancelEnrollment(errMsgId);
dismissTouchDialogIfSfps();
} }
private void announceEnrollmentProgress(CharSequence announcement) { private void announceEnrollmentProgress(CharSequence announcement) {
@@ -912,6 +916,18 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
mErrorText.removeCallbacks(mTouchAgainRunnable); mErrorText.removeCallbacks(mTouchAgainRunnable);
mErrorText.postDelayed(mTouchAgainRunnable, HINT_TIMEOUT_DURATION); mErrorText.postDelayed(mTouchAgainRunnable, HINT_TIMEOUT_DURATION);
} }
dismissTouchDialogIfSfps();
}
private void dismissTouchDialogIfSfps() {
if (!mCanAssumeSfps) {
return;
}
final IconTouchDialog dialog = (IconTouchDialog)
getSupportFragmentManager().findFragmentByTag(ICON_TOUCH_DIALOG);
if (dialog != null && dialog.isResumed()) {
dialog.dismiss();
}
} }
@Override @Override
@@ -976,7 +992,7 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
private void showIconTouchDialog() { private void showIconTouchDialog() {
mIconTouchCount = 0; mIconTouchCount = 0;
new IconTouchDialog().show(getSupportFragmentManager(), null /* tag */); new IconTouchDialog().show(getSupportFragmentManager(), ICON_TOUCH_DIALOG);
} }
private void showError(CharSequence error) { private void showError(CharSequence error) {