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 am: 506c6b804f am: 78ab60db84

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16365598

Change-Id: Ic324c6829d8dfa180ca7e0aaf5d8841c0e76dd88
This commit is contained in:
Joshua Mccloskey
2021-12-01 23:43:01 +00:00
committed by Automerger Merge Worker
parent 461018844c 78ab60db84
commit cc179be29f
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) {