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

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>

Conflicts:
	res/xml/privacy_settings_cyanogenmod.xml

11 files changed, 105 insertions, 88 deletions

diff --git a/res/xml/dashboard_categories.xml b/res/xml/dashboard_categories.xml
index eee8645..dc1effb 100644
--- a/res/xml/dashboard_categories.xml
+++ b/res/xml/dashboard_categories.xml
@@ -140,7 +140,7 @@
                 android:id="@+id/lockscreen_settings"
                 android:title="@string/lockscreen_settings"
                 android:fragment="com.android.settings.SecuritySettings"
-                android:icon="@drawable/ic_settings_security">
+                android:icon="@drawable/ic_settings_lockscreen">
                 <extra android:name="filter_type" android:value="0" />
         </dashboard-tile>
 
@@ -234,7 +234,7 @@
                 android:id="@+id/status_bar_settings"
                 android:title="@string/status_bar_title"
                 android:fragment="com.android.settings.cyanogenmod.StatusBarSettings"
-                android:icon="@drawable/ic_settings_extdesk_hidenavbar"
+                android:icon="@drawable/ic_settings_statusbar"
                 />
 
         <!-- Application Settings -->
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index e1306fb..63fd94a 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -21,9 +21,10 @@
         <PreferenceScreen android:key="system_update_settings"
                 android:title="@string/system_update_settings_list_item_title"
                 android:summary="@string/system_update_settings_list_item_summary">
-            <intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS"
-                    android:targetPackage="com.cyngn.fota"
-                    android:targetClass="com.cyngn.fota.SystemUpdateActivity" />
+            <intent android:action="android.intent.action.MAIN">
+                <categories android:name="android.settings.SYSTEM_UPDATE_SETTINGS" />
+                <categories android:name="com.android.settings.SHORTCUT" />
+            </intent>
         </PreferenceScreen>
 
         <PreferenceScreen android:key="additional_system_update_settings"
diff --git a/res/xml/notification_manager_settings.xml b/res/xml/notification_manager_settings.xml
index d929e50..b45cb6b 100644
--- a/res/xml/notification_manager_settings.xml
+++ b/res/xml/notification_manager_settings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2015 The CyanogenMod Project
+     Copyright (C) 2015-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.
@@ -31,13 +31,6 @@
             settings:keywords="@string/keywords_sounds_and_notifications_interruptions"
             android:fragment="com.android.settings.notification.ZenModeSettings" />
 
-    <!-- Do Not Disturb access -->
-    <Preference
-            android:key="manage_zen_access"
-            android:title="@string/manage_zen_access_title"
-            android:persistent="false"
-            android:fragment="com.android.settings.notification.ZenAccessSettings" />
-
     <!-- When device is locked -->
     <com.android.settings.DropDownPreference
             android:key="lock_screen_notifications"
diff --git a/res/xml/process_stats_summary.xml b/res/xml/process_stats_summary.xml
index d267272..70091ca 100644
--- a/res/xml/process_stats_summary.xml
+++ b/res/xml/process_stats_summary.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+     Copyright (C) 2015-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.
@@ -57,4 +59,8 @@
         android:key="apps_list"
         android:title="@string/memory_usage_apps" />
 
+    <Preference
+        android:key="apps_startup"
+        android:title="@string/memory_startup_apps_title" />
+
 </PreferenceScreen>
diff --git a/res/xml/security_settings_lockscreen.xml b/res/xml/security_settings_lockscreen.xml
index d0f3e55..a5aa767 100644
--- a/res/xml/security_settings_lockscreen.xml
+++ b/res/xml/security_settings_lockscreen.xml
@@ -31,24 +31,4 @@
 
     </PreferenceCategory>
 
-    <PreferenceCategory
-        android:key="general_category"
-        android:title="@string/title_general">
-
-        <com.android.settings.SingleLineSummaryPreference
-            android:key="owner_info_settings"
-            android:enabled="false"
-            android:title="@string/owner_info_settings_title"
-            android:summary="@string/owner_info_settings_summary"/>
-
-        <PreferenceScreen
-            android:key="lockscreen_shortcuts_settings"
-            android:title="@string/lockscreen_targets_message" >
-            <intent
-                android:targetPackage="com.android.systemui"
-                android:targetClass="com.android.systemui.cm.LockscreenShortcutsActivity" />
-        </PreferenceScreen>
-
-    </PreferenceCategory>
-
 </PreferenceScreen>
diff --git a/res/xml/security_settings_password.xml b/res/xml/security_settings_password.xml
index a89eba5..8610b20 100644
--- a/res/xml/security_settings_password.xml
+++ b/res/xml/security_settings_password.xml
@@ -29,11 +29,6 @@
             settings:keywords="@string/keywords_lockscreen"
             android:persistent="false"/>
 
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:key="general_category"
-        android:title="@string/title_general">
 
         <ListPreference
             android:key="lock_after_timeout"
@@ -47,10 +42,18 @@
             android:key="power_button_instantly_locks"
             android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
 
-        <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference
-            android:key="lockscreen_visualizer"
-            android:title="@string/lockscreen_visualizer_title"
-            android:defaultValue="true"/>
+        <Preference
+            android:key="manage_trust_agents"
+            android:title="@string/manage_trust_agents"
+            android:summary="@string/manage_trust_agents_summary"
+            android:persistent="false"
+            android:fragment="com.android.settings.TrustAgentSettings"/>
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="general_category"
+        android:title="@string/title_general">
 
         <com.android.settings.SingleLineSummaryPreference
             android:key="owner_info_settings"
@@ -65,11 +68,10 @@
                 android:targetClass="com.android.systemui.cm.LockscreenShortcutsActivity" />
         </PreferenceScreen>
 
-        <Preference android:key="manage_trust_agents"
-                    android:title="@string/manage_trust_agents"
-                    android:summary="@string/manage_trust_agents_summary"
-                    android:persistent="false"
-                    android:fragment="com.android.settings.TrustAgentSettings"/>
+        <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference
+            android:key="lockscreen_visualizer"
+            android:title="@string/lockscreen_visualizer_title"
+            android:defaultValue="true"/>
 
     </PreferenceCategory>
 
diff --git a/res/xml/security_settings_pattern.xml b/res/xml/security_settings_pattern.xml
index 08cc157..c047213 100644
--- a/res/xml/security_settings_pattern.xml
+++ b/res/xml/security_settings_pattern.xml
@@ -29,17 +29,22 @@
             settings:keywords="@string/keywords_lockscreen"
             android:persistent="false"/>
 
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:key="general_category"
-        android:title="@string/title_general">
 
         <SwitchPreference
             android:key="visiblepattern"
             android:persistent="false"
             android:title="@string/lockpattern_settings_enable_visible_pattern_title"/>
 
+        <SwitchPreference
+            android:key="visible_error_pattern"
+            android:persistent="false"
+            android:title="@string/lockpattern_settings_enable_error_path_title"/>
+
+        <SwitchPreference
+            android:key="visibledots"
+            android:persistent="false"
+            android:title="@string/lockpattern_settings_enable_dots_title"/>
+
         <ListPreference
             android:key="lock_after_timeout"
             android:title="@string/lock_after_timeout"
@@ -52,10 +57,18 @@
             android:key="power_button_instantly_locks"
             android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
 
-        <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference
-            android:key="lockscreen_visualizer"
-            android:title="@string/lockscreen_visualizer_title"
-            android:defaultValue="true"/>
+        <Preference
+            android:key="manage_trust_agents"
+            android:title="@string/manage_trust_agents"
+            android:summary="@string/manage_trust_agents_summary"
+            android:persistent="false"
+            android:fragment="com.android.settings.TrustAgentSettings" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="general_category"
+        android:title="@string/title_general">
 
         <com.android.settings.SingleLineSummaryPreference
             android:key="owner_info_settings"
@@ -70,11 +83,10 @@
                 android:targetClass="com.android.systemui.cm.LockscreenShortcutsActivity" />
         </PreferenceScreen>
 
-        <Preference android:key="manage_trust_agents"
-                    android:title="@string/manage_trust_agents"
-                    android:summary="@string/manage_trust_agents_summary"
-                    android:persistent="false"
-                    android:fragment="com.android.settings.TrustAgentSettings" />
+        <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference
+            android:key="lockscreen_visualizer"
+            android:title="@string/lockscreen_visualizer_title"
+            android:defaultValue="true"/>
 
     </PreferenceCategory>
 
diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml
index 058086e..56b08c0 100644
--- a/res/xml/security_settings_pin.xml
+++ b/res/xml/security_settings_pin.xml
@@ -29,11 +29,6 @@
             settings:keywords="@string/keywords_lockscreen"
             android:persistent="false"/>
 
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:key="general_category"
-        android:title="@string/title_general">
 
         <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference
             android:key="lockscreen_scramble_pin_layout"
@@ -52,10 +47,18 @@
             android:key="power_button_instantly_locks"
             android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
 
-        <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference
-            android:key="lockscreen_visualizer"
-            android:title="@string/lockscreen_visualizer_title"
-            android:defaultValue="true"/>
+        <Preference
+            android:key="manage_trust_agents"
+            android:title="@string/manage_trust_agents"
+            android:summary="@string/manage_trust_agents_summary"
+            android:persistent="false"
+            android:fragment="com.android.settings.TrustAgentSettings"/>
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="general_category"
+        android:title="@string/title_general">
 
         <com.android.settings.SingleLineSummaryPreference
             android:key="owner_info_settings"
@@ -70,11 +73,10 @@
                 android:targetClass="com.android.systemui.cm.LockscreenShortcutsActivity" />
         </PreferenceScreen>
 
-        <Preference android:key="manage_trust_agents"
-                    android:title="@string/manage_trust_agents"
-                    android:summary="@string/manage_trust_agents_summary"
-                    android:persistent="false"
-                    android:fragment="com.android.settings.TrustAgentSettings"/>
+        <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference
+            android:key="lockscreen_visualizer"
+            android:title="@string/lockscreen_visualizer_title"
+            android:defaultValue="true"/>
 
     </PreferenceCategory>
 
diff --git a/res/xml/status_bar_settings.xml b/res/xml/status_bar_settings.xml
index 0f0a159..3db9fed 100644
--- a/res/xml/status_bar_settings.xml
+++ b/res/xml/status_bar_settings.xml
@@ -56,22 +56,22 @@
         android:entries="@array/status_bar_battery_percentage_entries"
         android:entryValues="@array/status_bar_battery_percentage_values" />
 
-     <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference
+    <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference
         android:key="status_bar_brightness_control"
         android:title="@string/status_bar_toggle_brightness"
         android:summary="@string/status_bar_toggle_brightness_summary"
         android:defaultValue="false" />
 
-     <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference
+    <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference
         android:key="status_bar_notif_count"
         android:title="@string/status_bar_notif_count_title"
         android:summary="@string/status_bar_notif_count_summary"
         android:defaultValue="false" />
 
-    <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference
+    <ListPreference
         android:key="qs_quick_pulldown"
         android:title="@string/status_bar_quick_qs_pulldown_title"
-        android:summary="@string/status_bar_quick_qs_pulldown_summary"
-        android:defaultValue="true" />
+        android:entries="@array/status_bar_quick_qs_pulldown_entries"
+        android:entryValues="@array/status_bar_quick_qs_pulldown_values" />
 
 </PreferenceScreen>
diff --git a/res/xml/tether_prefs.xml b/res/xml/tether_prefs.xml
index 2f67dc4..5c5c080 100644
--- a/res/xml/tether_prefs.xml
+++ b/res/xml/tether_prefs.xml
@@ -26,14 +26,26 @@
         android:title="@string/wifi_tether_configure_ap_text"
         android:persistent="false" />
 
-    <SwitchPreference
-        android:key="usb_tether_settings"
-        android:title="@string/usb_tethering_button_text"
+    <ListPreference
+        android:key="hotstpot_inactivity_timeout"
+        android:title="@string/hotstpot_inactivity_timeout_text"
+        android:entries="@array/hotstpot_inactivity_timeout_entries"
+        android:entryValues="@array/hotstpot_inactivity_timeout_values"
         android:persistent="false" />
 
-    <SwitchPreference
-        android:key="enable_bluetooth_tethering"
-        android:title="@string/bluetooth_tether_checkbox_text"
-        android:persistent="false" />
+    <PreferenceCategory
+        android:title="@string/tethering_other_category_text">
+
+        <SwitchPreference
+            android:key="usb_tether_settings"
+            android:title="@string/usb_tethering_button_text"
+            android:persistent="false" />
+
+        <SwitchPreference
+            android:key="enable_bluetooth_tethering"
+            android:title="@string/bluetooth_tether_checkbox_text"
+            android:persistent="false" />
+
+    </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/zen_mode_settings.xml b/res/xml/zen_mode_settings.xml
index 267727f..258c583 100644
--- a/res/xml/zen_mode_settings.xml
+++ b/res/xml/zen_mode_settings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2014 The Android Open Source Project
+     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.
@@ -30,4 +31,12 @@
             android:key="automation_settings"
             android:title="@string/zen_mode_automation_settings_title"
             android:fragment="com.android.settings.notification.ZenModeAutomationSettings" />
+
+    <!-- Do Not Disturb access -->
+    <Preference
+            android:key="manage_zen_access"
+            android:title="@string/manage_zen_access_title"
+            android:persistent="false"
+            android:fragment="com.android.settings.notification.ZenAccessSettings" />
+
 </PreferenceScreen>