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

Merge "Update skip button label to "Do it later"" into oc-dr1-dev

Browse Source
This commit is contained in:
Maurice Lam
2017-06-27 01:10:36 +00:00
committed by Android (Google) Code Review
parent 624212f43c d342ad4878
commit b97f91c971
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout-land/fingerprint_enroll_enrolling.xml
View File

@@ -93,7 +93,7 @@
style="@style/SuwGlifButton.Secondary" style="@style/SuwGlifButton.Secondary"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/skip_label" /> android:text="@string/security_settings_fingerprint_enroll_enrolling_skip" />
</LinearLayout> </LinearLayout>

2
res/layout/fingerprint_enroll_enrolling_base_footer.xml
View File

@@ -26,6 +26,6 @@
android:id="@+id/skip_button" android:id="@+id/skip_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/skip_label" /> android:text="@string/security_settings_fingerprint_enroll_enrolling_skip" />
</LinearLayout> </LinearLayout>

2
res/values/strings.xml
View File

@@ -872,6 +872,8 @@
<string name="security_settings_fingerprint_enroll_finish_title">Fingerprint added</string> <string name="security_settings_fingerprint_enroll_finish_title">Fingerprint added</string>
<!-- Message shown in fingerprint enrollment dialog once enrollment is completed --> <!-- Message shown in fingerprint enrollment dialog once enrollment is completed -->
<string name="security_settings_fingerprint_enroll_finish_message">When you see this icon, use your fingerprint for identification or to approve purchases.</string> <string name="security_settings_fingerprint_enroll_finish_message">When you see this icon, use your fingerprint for identification or to approve purchases.</string>
<!-- Button text to skip enrollment of fingerprint [CHAR LIMIT=40] -->
<string name="security_settings_fingerprint_enroll_enrolling_skip">Do it later</string>
<!-- Title of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=40] --> <!-- Title of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=40] -->
<string name="setup_fingerprint_enroll_enrolling_skip_title">Skip fingerprint setup?</string> <string name="setup_fingerprint_enroll_enrolling_skip_title">Skip fingerprint setup?</string>
<!-- Content of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=NONE] --> <!-- Content of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=NONE] -->