Merge "Change "ringer volume" to "ring volume"" into nyc-mr1-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3a3f567..cd988b0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -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>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7896bbb..2722692 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -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>
@@ -2133,10 +2136,10 @@
<!-- Sound & display settings screen, setting option summary to enable adaptive brightness [CHAR LIMIT=100] -->
<string name="auto_brightness_summary">Optimize brightness level for available light</string>
- <!-- Night display screen, setting option name to enable night display. [CHAR LIMIT=30] -->
- <string name="night_display_title">Night display</string>
- <!-- Night display screen, description of night display feature. [CHAR LIMIT=NONE] -->
- <string name="night_display_text">Night display tints your screen red at night. This makes it easier to look at your screen in dim light and may help you fall asleep more easily.</string>
+ <!-- Night display screen, setting option name to enable night display (renamed "Night Light" with title caps). [CHAR LIMIT=30] -->
+ <string name="night_display_title">Night Light</string>
+ <!-- Night display screen, description of night display feature (renamed "Night Light" with title caps). [CHAR LIMIT=NONE] -->
+ <string name="night_display_text">Night Light tints your screen red at night. This makes it easier to look at your screen or read in dim light, and may help you fall asleep more easily.</string>
<!-- Night display screen, setting option name to configure whether night display turn on/off automatically. [CHAR LIMIT=30] -->
<string name="night_display_auto_mode_title">Turn on automatically</string>
<!-- Night display screen, setting option value for night display to *never* turn on/off automatically. [CHAR LIMIT=30] -->
@@ -3059,8 +3062,8 @@
<string name="manual">Manual</string>
<!-- About phone settings screen, setting option name to show regulatory labels [CHAR LIMIT=25] -->
<string name="regulatory_labels">Regulatory labels</string>
- <!-- About phone settings screen, setting option name to show safety and regulatory information [CHAR LIMIT=40] -->
- <string name="safety_and_regulatory_info">Safety & regulatory information</string>
+ <!-- About phone settings screen, setting option name to show the safety and regulatory manual [CHAR LIMIT=40] -->
+ <string name="safety_and_regulatory_info">Safety & regulatory manual</string>
<!-- Note: this may be replaced by a more-specific title of the activity that will get launched --> <skip />
<!-- About phone settings screen, setting option name to see copyright-related info -->
<string name="copyright_title">Copyright</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>
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index e96a050..a3305a2 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -81,10 +81,15 @@
<PreferenceScreen
android:key="doze"
android:title="@string/doze_title"
- android:summary="@string/doze_summary"
- android:fragment="com.android.settings.gestures.GestureSettings" >
+ android:summary="@string/doze_summary" >
<extra android:name="gesture_scroll_to_preference"
android:value="gesture_pick_up_and_nudge" />
+ <intent
+ android:targetPackage="com.android.settings"
+ android:targetClass="com.android.settings.Settings$GestureSettingsActivity" >
+ <extra android:name="show_drawer_menu"
+ android:value="true" />
+ </intent>
</PreferenceScreen>
<SwitchPreference