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

Merge "Added new string." into qt-qpr1-dev

Browse Source 
am: 262f5fe91f

Change-Id: If8467461e0963648886c02159353c177e9b88d41
This commit is contained in:
Joshua Mccloskey
2019-10-01 15:17:26 -07:00
committed by android-build-merger
parent 67fe04814d 262f5fe91f
commit b288f07bb2
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -914,6 +914,8 @@
<string name="security_settings_face_enroll_introduction_no_thanks">No thanks</string> <string name="security_settings_face_enroll_introduction_no_thanks">No thanks</string>
<!-- Button text to start enrollment [CHAR LIMIT=30] --> <!-- Button text to start enrollment [CHAR LIMIT=30] -->
<string name="security_settings_face_enroll_introduction_agree">Agree</string> <string name="security_settings_face_enroll_introduction_agree">Agree</string>
<!-- Button text to scroll to the end of a scrollview. [CHAR LIMIT=30] -->
<string name="security_settings_face_enroll_introduction_more">More</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] -->

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

@@ -81,7 +81,7 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
final RequireScrollMixin requireScrollMixin = getLayout().getMixin( final RequireScrollMixin requireScrollMixin = getLayout().getMixin(
RequireScrollMixin.class); RequireScrollMixin.class);
requireScrollMixin.requireScrollWithButton(this, agreeButton, requireScrollMixin.requireScrollWithButton(this, agreeButton,
R.string.wifi_more, R.string.security_settings_face_enroll_introduction_more,
button -> { button -> {
onNextButtonClick(button); onNextButtonClick(button);
}); });