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

Merge "Add require scrolling button for FingerprintEnrolling intro" into sc-dev am: b1b7029fa6

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

Change-Id: I34041ae1c70231864a1905d545ceea383db20c65
This commit is contained in:
TreeHugger Robot
2021-05-07 03:10:45 +00:00
committed by Automerger Merge Worker
parent e7f72efe61 b1b7029fa6
commit 2929cdd115
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
View File

@@ -37,6 +37,7 @@ import com.android.settingslib.RestrictedLockUtilsInternal;
import com.google.android.setupcompat.template.FooterBarMixin; import com.google.android.setupcompat.template.FooterBarMixin;
import com.google.android.setupcompat.template.FooterButton; import com.google.android.setupcompat.template.FooterButton;
import com.google.android.setupdesign.span.LinkSpan; import com.google.android.setupdesign.span.LinkSpan;
import com.google.android.setupdesign.template.RequireScrollMixin;
import java.util.List; import java.util.List;
@@ -69,14 +70,18 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction {
.build() .build()
); );
mFooterBarMixin.setPrimaryButton( final FooterButton nextButton = new FooterButton.Builder(this)
new FooterButton.Builder(this) .setText(R.string.security_settings_fingerprint_enroll_introduction_agree)
.setText(R.string.security_settings_fingerprint_enroll_introduction_agree) .setListener(this::onNextButtonClick)
.setListener(this::onNextButtonClick) .setButtonType(FooterButton.ButtonType.NEXT)
.setButtonType(FooterButton.ButtonType.NEXT) .setTheme(R.style.SudGlifButton_Primary)
.setTheme(R.style.SudGlifButton_Primary) .build();
.build()
); mFooterBarMixin.setPrimaryButton(nextButton);
final RequireScrollMixin requireScrollMixin =
getLayout().getMixin(RequireScrollMixin.class);
requireScrollMixin.requireScrollWithButton(this, nextButton,
R.string.security_settings_face_enroll_introduction_more, this::onNextButtonClick);
} }
int getNegativeButtonTextId() { int getNegativeButtonTextId() {