Merge "Add require scrolling button for FingerprintEnrolling intro" into sc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
b1b7029fa6
@@ -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() {
|
||||||
|
Reference in New Issue
Block a user