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

Merge "Update summary and title strings for Settings Suggestions" into nyc-mr1-dev

Browse Source
This commit is contained in:
Matthew Fritze
2016-07-13 21:03:33 +00:00
committed by Android (Google) Code Review
parent 38415ff361 a4e3c14848
commit 5d8b432137
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -1708,7 +1708,7 @@
<meta-data android:name="com.android.settings.require_feature" <meta-data android:name="com.android.settings.require_feature"
android:value="android.hardware.fingerprint" /> android:value="android.hardware.fingerprint" />
<meta-data android:name="com.android.settings.title" <meta-data android:name="com.android.settings.title"
android:resource="@string/suggested_lock_settings_title" /> android:resource="@string/suggested_fingerprint_lock_settings_title" />
<meta-data android:name="com.android.settings.summary" <meta-data android:name="com.android.settings.summary"
android:resource="@string/suggested_fingerprint_lock_settings_summary" /> android:resource="@string/suggested_fingerprint_lock_settings_summary" />
</activity> </activity>

7
res/values/strings.xml
View File

@@ -988,11 +988,14 @@
<!-- Security Picker --><skip /> <!-- Security Picker --><skip />
<!-- Title for suggested actions for screen lock --> <!-- Title for suggested actions for screen lock -->
<string name="suggested_lock_settings_title">Screen lock</string> <string name="suggested_lock_settings_title">Set screen lock</string>
<!-- Summary for suggested actions for screen lock --> <!-- Summary for suggested actions for screen lock -->
<string name="suggested_lock_settings_summary">Protect your device</string> <string name="suggested_lock_settings_summary">Protect your device</string>
<!-- Title for suggested actions for settings up a fingerprint lock -->
<string name="suggested_fingerprint_lock_settings_title">Use fingerprint</string>
<!-- Summary for suggested actions for settings up a fingerprint lock --> <!-- Summary for suggested actions for settings up a fingerprint lock -->
<string name="suggested_fingerprint_lock_settings_summary">Unlock with your fingerprint</string> <string name="suggested_fingerprint_lock_settings_summary">Unlock with your fingerprint</string>
@@ -7399,7 +7402,7 @@
<string name="suggestion_additional_fingerprints">Add another fingerprint</string> <string name="suggestion_additional_fingerprints">Add another fingerprint</string>
<!-- Summary for suggestion adding more fingerprints [CHAR LIMIT=60] --> <!-- Summary for suggestion adding more fingerprints [CHAR LIMIT=60] -->
<string name="suggestion_additional_fingerprints_summary">Unlock with a different fingerprint</string> <string name="suggestion_additional_fingerprints_summary">Unlock with a different finger</string>
<!-- Summary of battery saver when on [CHAR LIMIT=NONE] --> <!-- Summary of battery saver when on [CHAR LIMIT=NONE] -->
<string name="battery_saver_on_summary">On / <xliff:g name="automatic_state" example="Never turn on automatically">%1$s</xliff:g></string> <string name="battery_saver_on_summary">On / <xliff:g name="automatic_state" example="Never turn on automatically">%1$s</xliff:g></string>