Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_packages_apps_Settings into replicant-6.0

19 files changed, 181 insertions, 64 deletions

diff --git a/res/xml/advanced_apps.xml b/res/xml/advanced_apps.xml
index 70b68568c..4809be6b9 100644
--- a/res/xml/advanced_apps.xml
+++ b/res/xml/advanced_apps.xml
@@ -17,6 +17,7 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    android:title="@string/configure_apps"
     android:key="applications_settings">
 
     <PreferenceScreen
diff --git a/res/xml/app_notification_settings.xml b/res/xml/app_notification_settings.xml
index b7557b279..11057f391 100644
--- a/res/xml/app_notification_settings.xml
+++ b/res/xml/app_notification_settings.xml
@@ -50,11 +50,35 @@
             android:order="4"
             android:persistent="false" />
 
+    <!-- Keyguard options -->
+    <SwitchPreference
+            android:key="show_on_keyguard"
+            android:title="@string/app_notification_show_on_keyguard_title"
+            android:summary="@string/app_notification_show_on_keyguard_summary"
+            android:order="5"
+            android:persistent="false" />
+
+    <SwitchPreference
+            android:key="no_ongoing_on_keyguard"
+            android:title="@string/app_notification_no_ongoing_on_keyguard_title"
+            android:summary="@string/app_notification_no_ongoing_on_keyguard_summary"
+            android:order="6"
+            android:dependency="show_on_keyguard"
+            android:persistent="false" />
+
+    <ListPreference
+            android:key="sound_timeout"
+            android:title="@string/app_notification_sound_timeout_title"
+            android:entries="@array/app_notification_sound_timeout_entries"
+            android:entryValues="@array/app_notification_sound_timeout_values"
+            android:order="7"
+            android:persistent="false" />
+
     <!-- App notification preferences -->
     <Preference
             android:key="app_settings"
             android:title="@string/app_notification_preferences"
-            android:order="5"
+            android:order="8"
             android:persistent="false" />
 
 </PreferenceScreen>
diff --git a/res/xml/button_settings.xml b/res/xml/button_settings.xml
index 9a85b6f84..68e128563 100644
--- a/res/xml/button_settings.xml
+++ b/res/xml/button_settings.xml
@@ -15,6 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/button_pref_title"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 
     <SwitchPreference
diff --git a/res/xml/dashboard_categories.xml b/res/xml/dashboard_categories.xml
index dc1effba5..24deb20d3 100644
--- a/res/xml/dashboard_categories.xml
+++ b/res/xml/dashboard_categories.xml
@@ -152,26 +152,7 @@
                 android:icon="@drawable/ic_settings_buttons"
                 />
 
-        <!-- O-Click -->
-        <dashboard-tile
-                android:id="@+id/oclick"
-                android:icon="@drawable/ic_settings_oclick">
-            <intent
-                    android:action="com.cyanogenmod.action.LAUNCH_BLUETOOTH_INPUT_SETTINGS"
-                    android:targetPackage="com.cyanogenmod.settings.device"
-                    android:targetClass="com.cyanogenmod.settings.device.BluetoothInputSettings" />
-        </dashboard-tile>
-
-        <!-- Gestures -->
-        <dashboard-tile
-                android:id="@+id/device_specific_gesture_settings"
-                android:title="@string/gesture_settings_title"
-                android:icon="@drawable/ic_settings_gestures">
-            <intent
-                    android:action="com.cyanogenmod.action.LAUNCH_TOUCHSCREEN_GESTURE_SETTINGS"
-                    android:targetPackage="com.cyanogenmod.settings.device"
-                    android:targetClass="com.cyanogenmod.settings.device.TouchscreenGestureSettings" />
-        </dashboard-tile>
+        <external-tiles />
 
         <!-- Battery -->
         <dashboard-tile
@@ -289,6 +270,14 @@
                 android:icon="@drawable/ic_settings_date_time"
                 />
 
+        <!-- Weather -->
+        <dashboard-tile
+                android:id="@+id/weather_settings"
+                android:title="@string/weather_settings_title"
+                android:fragment="com.android.settings.cyanogenmod.WeatherServiceSettings"
+                android:icon="@drawable/ic_settings_weather"
+                />
+
         <!-- Accessibility feedback -->
         <dashboard-tile
                 android:id="@+id/accessibility_settings"
diff --git a/res/xml/default_apps.xml b/res/xml/default_apps.xml
index d5f9de043..41ab072b2 100644
--- a/res/xml/default_apps.xml
+++ b/res/xml/default_apps.xml
@@ -17,6 +17,7 @@
 <PreferenceScreen
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        android:title="@string/default_apps_title"
         android:key="default_apps">
 
     <Preference
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 0c9856fcd..c95cfb8cf 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -82,9 +82,12 @@
     <ListPreference
         android:key="root_access"
         android:title="@string/root_access"
-        android:persistent="false"
-        android:entries="@array/root_access_entries"
-        android:entryValues="@array/root_access_values" />
+        android:persistent="false" />
+
+    <Preference
+        android:key="root_appops"
+        android:title="@string/root_appops_title"
+        android:summary="@string/root_appops_summary" />
 
     <SwitchPreference
         android:key="update_recovery"
diff --git a/res/xml/display.xml b/res/xml/display.xml
index 2b63ee5ab..14b44eaa2 100644
--- a/res/xml/display.xml
+++ b/res/xml/display.xml
@@ -16,6 +16,7 @@
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    android:title="@string/display_and_lights"
     settings:keywords="@string/keywords_display">
 
     <PreferenceCategory
@@ -67,8 +68,8 @@
         <!-- Double tap to wake -->
         <SwitchPreference
                 android:key="tap_to_wake"
-                android:title="@string/tap_to_wake"
-                android:summary="@string/tap_to_wake_summary"
+                android:title="@string/double_tap_to_wake_title"
+                android:summary="@string/double_tap_to_wake_summary"
                 android:persistent="false" />
 
         <!-- Double tap to sleep -->
@@ -79,6 +80,12 @@
                 android:defaultValue="true" />
 
         <SwitchPreference
+                android:key="high_touch_sensitivity"
+                android:title="@string/high_touch_sensitivity_title"
+                android:summary="@string/high_touch_sensitivity_summary"
+                android:defaultValue="false" />
+
+        <SwitchPreference
                 android:key="camera_gesture"
                 android:title="@string/camera_gesture_title"
                 android:summary="@string/camera_gesture_desc"
@@ -88,8 +95,7 @@
         <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference
                 android:key="proximity_on_wake"
                 android:title="@string/proximity_wake_title"
-                android:summary="@string/proximity_wake_summary"
-                android:defaultValue="true" />
+                android:summary="@string/proximity_wake_summary" />
 
         <!-- Seconds before sleep -->
         <ListPreference
diff --git a/res/xml/display_rotation.xml b/res/xml/display_rotation.xml
index c6a339454..b839e3910 100644
--- a/res/xml/display_rotation.xml
+++ b/res/xml/display_rotation.xml
@@ -21,10 +21,11 @@
     <SwitchPreference
         android:key="accelerometer"
         android:title="@string/accelerometer_title" />
-    <SwitchPreference
+    <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference
         android:key="lockscreen_rotation"
         android:title="@string/display_lockscreen_rotation_title"
-        android:dependency="accelerometer" />
+        android:dependency="accelerometer"
+        android:defaultValue="false" />
     <PreferenceCategory
         android:key="display_rotation_category"
         android:title="@string/display_rotation_category_title" />
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index 2b35f2b26..f6bcb60aa 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -133,12 +133,6 @@
                 android:persistent="false" />
 
         <SwitchPreference
-                android:key="high_touch_sensitivity"
-                android:title="@string/high_touch_sensitivity_title"
-                android:summary="@string/high_touch_sensitivity_summary"
-                android:defaultValue="false" />
-
-        <SwitchPreference
                 android:key="touchscreen_hovering"
                 android:title="@string/touchscreen_hovering_title"
                 android:summary="@string/touchscreen_hovering_summary"
diff --git a/res/xml/livedisplay.xml b/res/xml/livedisplay.xml
index 141fc6892..3f0af3a0b 100644
--- a/res/xml/livedisplay.xml
+++ b/res/xml/livedisplay.xml
@@ -44,7 +44,7 @@
                 android:key="display_auto_outdoor_mode"
                 android:title="@string/live_display_outdoor_mode_title"
                 android:summary="@string/live_display_outdoor_mode_summary"
-                android:defaultValue="true" />
+                android:defaultValue="@*cyanogenmod.platform:bool/config_defaultAutoOutdoorMode" />
 
     </PreferenceCategory>
 
@@ -52,18 +52,7 @@
             android:key="advanced"
             android:title="@string/advanced">
 
-        <!-- screen color -->
-        <PreferenceScreen
-                android:persistent="false"
-                android:key="screencolor_settings"
-                android:title="@string/screencolor"
-                android:summary="@string/screencolor_summary">
-            <intent
-                    android:action="com.qualcomm.display.PPService"
-                    android:targetPackage="com.android.settings"
-                    android:targetClass="com.android.settings.ScreenColorSettings" />
-        </PreferenceScreen>
-
+        <!-- RGB display color adjustments -->
         <com.android.settings.livedisplay.DisplayColor
                 android:key="color_calibration"
                 android:title="@string/color_calibration_title"
@@ -71,11 +60,12 @@
                 android:summary="@string/color_calibration_summary"
                 android:persistent="false"/>
 
-        <com.android.settings.livedisplay.DisplayGamma
-                android:key="gamma_tuning"
-                android:title="@string/gamma_tuning_title_head"
-                android:dialogTitle="@string/gamma_tuning_title_head"
-                android:summary="@string/gamma_tuning_summary_head"
+        <!-- HSIC display color adjustments -->
+        <com.android.settings.livedisplay.PictureAdjustment
+                android:key="picture_adjustment"
+                android:title="@string/picture_adjustment_title"
+                android:dialogTitle="@string/picture_adjustment_title"
+                android:summary="@string/picture_adjustment_summary"
                 android:persistent="false"/>
 
         <!-- Adaptive backlight -->
@@ -83,14 +73,14 @@
                 android:key="display_low_power"
                 android:title="@string/live_display_low_power_title"
                 android:summary="@string/live_display_low_power_summary"
-                android:defaultValue="true" />
+                android:defaultValue="@*cyanogenmod.platform:bool/config_defaultCABC" />
 
         <!-- Color enhancement -->
         <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference
                 android:key="display_color_enhance"
                 android:title="@string/live_display_enhance_color_title"
                 android:summary="@string/live_display_enhance_color_summary"
-                android:defaultValue="true" />
+                android:defaultValue="@*cyanogenmod.platform:bool/config_defaultColorEnhancement" />
 
     </PreferenceCategory>
 
diff --git a/res/xml/notification_manager_settings.xml b/res/xml/notification_manager_settings.xml
index b45cb6bcf..a09eea481 100644
--- a/res/xml/notification_manager_settings.xml
+++ b/res/xml/notification_manager_settings.xml
@@ -15,6 +15,7 @@
      limitations under the License.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/notification_manager"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 
     <!-- Heads up -->
diff --git a/res/xml/privacy_settings_cyanogenmod.xml b/res/xml/privacy_settings_cyanogenmod.xml
index 6cf695b02..cf84b0232 100644
--- a/res/xml/privacy_settings_cyanogenmod.xml
+++ b/res/xml/privacy_settings_cyanogenmod.xml
@@ -15,7 +15,7 @@
      limitations under the License.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/privacy_settings_title">
+        android:title="@string/privacy_settings_cyanogenmod_title">
 
         <Preference
             android:key="privacy_guard_manager"
diff --git a/res/xml/security_settings_chooser.xml b/res/xml/security_settings_chooser.xml
index a097abfaa..d82ad1101 100644
--- a/res/xml/security_settings_chooser.xml
+++ b/res/xml/security_settings_chooser.xml
@@ -51,6 +51,23 @@
             android:title="@string/lockscreen_visualizer_title"
             android:defaultValue="true"/>
 
+        <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference
+            android:key="lock_screen_blur_enabled"
+            android:title="@string/lockscreen_blur_enabled_title"
+            android:defaultValue="true"/>
+
+        <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference
+            android:key="lock_screen_weather_enabled"
+            android:title="@string/lockscreen_weather_enabled_title"
+            android:defaultValue="false"/>
+
+        <PreferenceScreen
+            android:key="lockscreen_wallpaper"
+            android:title="@string/lockscreen_wallpaper_title" >
+            <intent
+                android:action="android.intent.action.SET_KEYGUARD_WALLPAPER" />
+        </PreferenceScreen>
+
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/security_settings_password.xml b/res/xml/security_settings_password.xml
index 680a57927..188f986e1 100644
--- a/res/xml/security_settings_password.xml
+++ b/res/xml/security_settings_password.xml
@@ -77,6 +77,23 @@
             android:title="@string/lockscreen_visualizer_title"
             android:defaultValue="true"/>
 
+        <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference
+            android:key="lock_screen_blur_enabled"
+            android:title="@string/lockscreen_blur_enabled_title"
+            android:defaultValue="true"/>
+
+        <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference
+            android:key="lock_screen_weather_enabled"
+            android:title="@string/lockscreen_weather_enabled_title"
+            android:defaultValue="false"/>
+
+        <PreferenceScreen
+            android:key="lockscreen_wallpaper"
+            android:title="@string/lockscreen_wallpaper_title" >
+            <intent
+                android:action="android.intent.action.SET_KEYGUARD_WALLPAPER" />
+        </PreferenceScreen>
+
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/security_settings_pattern.xml b/res/xml/security_settings_pattern.xml
index 2576ea758..44fe95f84 100644
--- a/res/xml/security_settings_pattern.xml
+++ b/res/xml/security_settings_pattern.xml
@@ -93,6 +93,23 @@
             android:title="@string/lockscreen_visualizer_title"
             android:defaultValue="true"/>
 
+        <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference
+            android:key="lock_screen_blur_enabled"
+            android:title="@string/lockscreen_blur_enabled_title"
+            android:defaultValue="true"/>
+
+        <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference
+            android:key="lock_screen_weather_enabled"
+            android:title="@string/lockscreen_weather_enabled_title"
+            android:defaultValue="false"/>
+
+        <PreferenceScreen
+            android:key="lockscreen_wallpaper"
+            android:title="@string/lockscreen_wallpaper_title" >
+            <intent
+                android:action="android.intent.action.SET_KEYGUARD_WALLPAPER" />
+        </PreferenceScreen>
+
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml
index a378ef92b..254707909 100644
--- a/res/xml/security_settings_pin.xml
+++ b/res/xml/security_settings_pin.xml
@@ -82,6 +82,23 @@
             android:title="@string/lockscreen_visualizer_title"
             android:defaultValue="true"/>
 
+        <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference
+            android:key="lock_screen_blur_enabled"
+            android:title="@string/lockscreen_blur_enabled_title"
+            android:defaultValue="true"/>
+
+        <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference
+            android:key="lock_screen_weather_enabled"
+            android:title="@string/lockscreen_weather_enabled_title"
+            android:defaultValue="false"/>
+
+        <PreferenceScreen
+            android:key="lockscreen_wallpaper"
+            android:title="@string/lockscreen_wallpaper_title" >
+            <intent
+                android:action="android.intent.action.SET_KEYGUARD_WALLPAPER" />
+        </PreferenceScreen>
+
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/weather_settings.xml b/res/xml/weather_settings.xml
new file mode 100644
index 000000000..17df51a62
--- /dev/null
+++ b/res/xml/weather_settings.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2016 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  android:title="@string/weather_settings_general_settings_title"
+                  settings:keywords="@string/weather_settings_keyword">
+    <PreferenceCategory
+            android:key="weather_general_settings"
+            android:title="@string/weather_settings_general_settings_title"
+            android:order="0">
+        <ListPreference
+                android:key="weather_temperature_unit"
+                android:entries="@array/weather_temp_unit_entries"
+                android:entryValues="@array/weather_temp_unit_values"
+                android:title="@string/weather_settings_temp_units_title"
+                android:summary="%s"
+                android:persistent="false" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="weather_service_providers"
+        android:title="@string/weather_settings_providers_title"
+        android:order="1">
+
+    </PreferenceCategory>
+</PreferenceScreen>
diff --git a/res/xml/wifi_advanced_settings.xml b/res/xml/wifi_advanced_settings.xml
index 09d0f18a7..7f25708b6 100644
--- a/res/xml/wifi_advanced_settings.xml
+++ b/res/xml/wifi_advanced_settings.xml
@@ -38,13 +38,6 @@
             android:dialogTitle="@string/wifi_select_assistant_dialog_title"
             android:persistent="false" />
 
-    <!-- android:dependency="enable_wifi" -->
-    <SwitchPreference
-            android:key="wifi_poor_network_detection"
-            android:title="@string/wifi_poor_network_detection"
-            android:summary="@string/wifi_poor_network_detection_summary"
-            android:persistent="false" />
-
     <ListPreference
             android:key="frequency_band"
             android:title="@string/wifi_setting_frequency_band_title"
diff --git a/res/xml/zen_mode_priority_settings.xml b/res/xml/zen_mode_priority_settings.xml
index 37ec317f9..567b9e72b 100644
--- a/res/xml/zen_mode_priority_settings.xml
+++ b/res/xml/zen_mode_priority_settings.xml
@@ -57,6 +57,11 @@
         android:title="@string/zen_mode_repeat_callers"
         android:persistent="false"/>
 
+	<com.android.settings.DropDownPreference
+        android:key="vibration"
+        android:title="@string/zen_mode_vibration"
+        android:persistent="false" />
+
     <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference
         android:key="zen_priority_allow_lights"
         android:title="@string/notification_light_title"