Merge "Add require scrolling button for FingerprintEnrolling intro" into sc-dev
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
index 0996a58..1622086 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
@@ -37,6 +37,7 @@
import com.google.android.setupcompat.template.FooterBarMixin;
import com.google.android.setupcompat.template.FooterButton;
import com.google.android.setupdesign.span.LinkSpan;
+import com.google.android.setupdesign.template.RequireScrollMixin;
import java.util.List;
@@ -69,14 +70,18 @@
.build()
);
- mFooterBarMixin.setPrimaryButton(
- new FooterButton.Builder(this)
- .setText(R.string.security_settings_fingerprint_enroll_introduction_agree)
- .setListener(this::onNextButtonClick)
- .setButtonType(FooterButton.ButtonType.NEXT)
- .setTheme(R.style.SudGlifButton_Primary)
- .build()
- );
+ final FooterButton nextButton = new FooterButton.Builder(this)
+ .setText(R.string.security_settings_fingerprint_enroll_introduction_agree)
+ .setListener(this::onNextButtonClick)
+ .setButtonType(FooterButton.ButtonType.NEXT)
+ .setTheme(R.style.SudGlifButton_Primary)
+ .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() {