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

Do not scan for fingerprint when rename dialog is showing

Browse Source 
Fixes: 185670313
Test: manual
Change-Id: If153806d25c5397f1699d049a10c5bccaf87e413
This commit is contained in:
Kevin Chyn
2021-04-19 14:20:56 -07:00
parent 83b061d3da
commit ee8fc8d587
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,6 +41,8 @@ import android.view.View;
import android.widget.ImeAwareEditText; import android.widget.ImeAwareEditText;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference; import androidx.preference.Preference;
@@ -548,10 +550,14 @@ public class FingerprintSettings extends SubSettings {
} else { } else {
args.putParcelable("fingerprint", fp); args.putParcelable("fingerprint", fp);
} }
renameDialog.setOnDismissListener((dialogInterface) -> {
retryFingerprint();
});
renameDialog.setDeleteInProgress(mRemovalSidecar.inProgress()); renameDialog.setDeleteInProgress(mRemovalSidecar.inProgress());
renameDialog.setArguments(args); renameDialog.setArguments(args);
renameDialog.setTargetFragment(this, 0); renameDialog.setTargetFragment(this, 0);
renameDialog.show(getFragmentManager(), RenameDialog.class.getName()); renameDialog.show(getFragmentManager(), RenameDialog.class.getName());
mAuthenticateSidecar.stopAuthentication();
} }
@Override @Override
@@ -777,12 +783,19 @@ public class FingerprintSettings extends SubSettings {
private Fingerprint mFp; private Fingerprint mFp;
private ImeAwareEditText mDialogTextField; private ImeAwareEditText mDialogTextField;
private AlertDialog mAlertDialog; private AlertDialog mAlertDialog;
private @Nullable DialogInterface.OnDismissListener mDismissListener;
private boolean mDeleteInProgress; private boolean mDeleteInProgress;
public void setDeleteInProgress(boolean deleteInProgress) { public void setDeleteInProgress(boolean deleteInProgress) {
mDeleteInProgress = deleteInProgress; mDeleteInProgress = deleteInProgress;
} }
@Override
public void onCancel(DialogInterface dialog) {
super.onCancel(dialog);
mDismissListener.onDismiss(dialog);
}
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
mFp = getArguments().getParcelable("fingerprint"); mFp = getArguments().getParcelable("fingerprint");
@@ -818,6 +831,7 @@ public class FingerprintSettings extends SubSettings {
parent.renameFingerPrint(mFp.getBiometricId(), parent.renameFingerPrint(mFp.getBiometricId(),
newName); newName);
} }
mDismissListener.onDismiss(dialog);
dialog.dismiss(); dialog.dismiss();
} }
}) })
@@ -844,6 +858,10 @@ public class FingerprintSettings extends SubSettings {
return mAlertDialog; return mAlertDialog;
} }
public void setOnDismissListener(@NonNull DialogInterface.OnDismissListener listener) {
mDismissListener = listener;
}
public void enableDelete() { public void enableDelete() {
mDeleteInProgress = false; mDeleteInProgress = false;
if (mAlertDialog != null) { if (mAlertDialog != null) {