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

Merge "Modified text to cancel enrollment" into qt-r1-dev am: fde49ec3ad

Browse Source 
am: cbeeed9942

Change-Id: I6a62cccc71ce78f49ab85713b162be1395f8769d
This commit is contained in:
Joshua Mccloskey
2019-09-05 16:10:00 -07:00
committed by android-build-merger
parent 27c1468940 cbeeed9942
commit b8e4bd45c2
2 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -910,6 +910,10 @@
<string name="security_settings_face_enroll_introduction_accessibility_vision"></string> <string name="security_settings_face_enroll_introduction_accessibility_vision"></string>
<!-- Button text to cancel enrollment from the introduction [CHAR LIMIT=22] --> <!-- Button text to cancel enrollment from the introduction [CHAR LIMIT=22] -->
<string name="security_settings_face_enroll_introduction_cancel">Cancel</string> <string name="security_settings_face_enroll_introduction_cancel">Cancel</string>
<!-- Button text to cancel enrollment [CHAR LIMIT=30] -->
<string name="security_settings_face_enroll_introduction_no_thanks">No thanks</string>
<!-- Button text to start enrollment [CHAR LIMIT=30] -->
<string name="security_settings_face_enroll_introduction_agree">Agree</string>
<!-- Introduction title shown in face enrollment to introduce the face unlock feature [CHAR LIMIT=40] --> <!-- Introduction title shown in face enrollment to introduce the face unlock feature [CHAR LIMIT=40] -->
<string name="security_settings_face_enroll_introduction_title">Unlock with your face</string> <string name="security_settings_face_enroll_introduction_title">Unlock with your face</string>
<!-- Introduction title shown in face enrollment to introduce the face unlock feature, when face unlock is disabled by device admin [CHAR LIMIT=60] --> <!-- Introduction title shown in face enrollment to introduce the face unlock feature, when face unlock is disabled by device admin [CHAR LIMIT=60] -->

30
src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
View File

@@ -47,29 +47,19 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
mFaceManager = Utils.getFaceManagerOrNull(this); mFaceManager = Utils.getFaceManagerOrNull(this);
mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class); mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class);
if (WizardManagerHelper.isAnySetupWizard(getIntent())) {
mFooterBarMixin.setSecondaryButton( mFooterBarMixin.setSecondaryButton(
new FooterButton.Builder(this) new FooterButton.Builder(this)
.setText(R.string.skip_label) .setText(R.string.security_settings_face_enroll_introduction_no_thanks)
.setListener(this::onSkipButtonClick) .setListener(this::onCancelButtonClick)
.setButtonType(FooterButton.ButtonType.SKIP) .setButtonType(FooterButton.ButtonType.CANCEL)
.setTheme(R.style.SudGlifButton_Secondary) .setTheme(R.style.SudGlifButton_Secondary)
.build() .build()
); );
} else {
mFooterBarMixin.setSecondaryButton(
new FooterButton.Builder(this)
.setText(R.string.security_settings_face_enroll_introduction_cancel)
.setListener(this::onCancelButtonClick)
.setButtonType(FooterButton.ButtonType.CANCEL)
.setTheme(R.style.SudGlifButton_Secondary)
.build()
);
}
mFooterBarMixin.setPrimaryButton( mFooterBarMixin.setPrimaryButton(
new FooterButton.Builder(this) new FooterButton.Builder(this)
.setText(R.string.wizard_next) .setText(R.string.security_settings_face_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)