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 am: b97f91c971

Browse Source 
am: 467f39d243

Change-Id: Ibcb63391115160778939577fd7d34f6b84a77b49
This commit is contained in:
Maurice Lam
2017-06-27 18:54:57 +00:00
committed by android-build-merger
parent 02a370653c 467f39d243
commit d059e293fa
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"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/skip_label" />
android:text="@string/security_settings_fingerprint_enroll_enrolling_skip" />
</LinearLayout>

2
res/layout/fingerprint_enroll_enrolling_base_footer.xml
View File

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

2
res/values/strings.xml
View File

@@ -874,6 +874,8 @@
<string name="security_settings_fingerprint_enroll_finish_title">Fingerprint added</string>
<!-- 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>
<!-- 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] -->
<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] -->