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 
am: 5d8b432137

Change-Id: I0852939447039fdaefa14a151bba0f60aa4b6f43
This commit is contained in:
Daniel Nishi
2016-07-13 21:12:53 +00:00
committed by android-build-merger
parent 989a536667 5d8b432137
commit a2f07b0475
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"
android:value="android.hardware.fingerprint" />
<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"
android:resource="@string/suggested_fingerprint_lock_settings_summary" />
</activity>

7
res/values/strings.xml
View File

@@ -988,11 +988,14 @@
<!-- Security Picker --><skip />
<!-- 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 -->
<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 -->
<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>
<!-- 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] -->
<string name="battery_saver_on_summary">On / <xliff:g name="automatic_state" example="Never turn on automatically">%1$s</xliff:g></string>