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

Merge "Fixed face enroll intro button issue" into sc-v2-dev

Browse Source
This commit is contained in:
Joshua Mccloskey
2021-12-01 23:08:49 +00:00
committed by Android (Google) Code Review
parent d51b41d4ec 756fa20e1c
commit 506c6b804f
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -203,11 +203,15 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
getMoreButtonTextRes(), this::onNextButtonClick); getMoreButtonTextRes(), this::onNextButtonClick);
requireScrollMixin.setOnRequireScrollStateChangedListener( requireScrollMixin.setOnRequireScrollStateChangedListener(
scrollNeeded -> { scrollNeeded -> {
boolean enrollmentCompleted = checkMaxEnrolled() != 0;
if (!enrollmentCompleted) {
// Update text of primary button from "More" to "Agree". // Update text of primary button from "More" to "Agree".
final int primaryButtonTextRes = scrollNeeded final int primaryButtonTextRes = scrollNeeded
? getMoreButtonTextRes() ? getMoreButtonTextRes()
: getAgreeButtonTextRes(); : getAgreeButtonTextRes();
getPrimaryFooterButton().setText(this, primaryButtonTextRes); getPrimaryFooterButton().setText(this, primaryButtonTextRes);
}
// Show secondary button once scroll is completed. // Show secondary button once scroll is completed.
if (!scrollNeeded) { if (!scrollNeeded) {