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

Show "Done" button to prevent user from getting stuck

Browse Source 
When the user has already reached max enrollments, we should show a done
button. It's possible to get to the introduction page (back button during
SUW, or launching android.settings.BIOMETRIC_ENROLL).

Bug: 111548033
Test: Done button is shown and works as expected when max enrollments
Change-Id: Ia70c21f63606393116e222ca940ee93bcfb25995
This commit is contained in:
Kevin Chyn
2018-12-27 13:38:35 -08:00
parent 28ac88a736
commit 71724ae03c
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
View File

@@ -150,7 +150,8 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
getNextButton().setVisibility(View.VISIBLE);
} else {
mErrorText.setText(errorMsg);
getNextButton().setVisibility(View.GONE);
getNextButton().setText(getResources().getString(R.string.done));
getNextButton().setVisibility(View.VISIBLE);
}
}
@@ -162,8 +163,13 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
@Override
protected void onNextButtonClick(View view) {
// Lock thingy is already set up, launch directly to the next page
launchNextEnrollingActivity(mToken);
if (checkMaxEnrolled() == 0) {
// Lock thingy is already set up, launch directly to the next page
launchNextEnrollingActivity(mToken);
} else {
setResult(RESULT_FINISHED);
finish();
}
}
private void launchChooseLock() {