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

Cancel enrollment when back or negative buttons pressed

Browse Source 
Fixes: 183671394
Test: Go through enrollment flow and test various buttons
Change-Id: I8d3939de42ecd0a889f0c6d3c94002199285ef8b
This commit is contained in:
Kevin Chyn
2021-05-03 14:43:34 -07:00
parent 501eea7fa2
commit 33ba245149
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/biometrics/BiometricsEnrollEnrolling.java
View File

@@ -89,6 +89,17 @@ public abstract class BiometricsEnrollEnrolling extends BiometricEnrollBase
@Override
public void onBackPressed() {
cancelEnrollment();
super.onBackPressed();
}
protected void onSkipButtonClick(View view) {
cancelEnrollment();
setResult(RESULT_SKIP);
finish();
}
public void cancelEnrollment() {
if (mSidecar != null) {
mSidecar.setListener(null);
mSidecar.cancelEnrollment();
@@ -96,12 +107,6 @@ public abstract class BiometricsEnrollEnrolling extends BiometricEnrollBase
.beginTransaction().remove(mSidecar).commitAllowingStateLoss();
mSidecar = null;
}
super.onBackPressed();
}
protected void onSkipButtonClick(View view) {
setResult(RESULT_SKIP);
finish();
}
public void startEnrollment() {

17
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
View File

@@ -111,6 +111,12 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements
}
}
@Override
public void onBackPressed() {
stopLookingForFingerprint();
super.onBackPressed();
}
protected int getContentView() {
if (mCanAssumeUdfps) {
if (BiometricUtils.isReverseLandscape(getApplicationContext())) {
@@ -130,6 +136,16 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements
}
}
private void stopLookingForFingerprint() {
if (mSidecar != null) {
mSidecar.setListener(null);
mSidecar.cancelEnrollment();
getSupportFragmentManager()
.beginTransaction().remove(mSidecar).commitAllowingStateLoss();
mSidecar = null;
}
}
private void startLookingForFingerprint() {
mSidecar = (FingerprintEnrollSidecar) getSupportFragmentManager().findFragmentByTag(
FingerprintEnrollEnrolling.TAG_SIDECAR);
@@ -185,6 +201,7 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements
}
protected void onSkipButtonClick(View view) {
stopLookingForFingerprint();
setResult(RESULT_SKIP);
finish();
}