From 5af31cd0b080e3175d4ead9ad5590760b682fbb0 Mon Sep 17 00:00:00 2001
From: Adnan Begovic <adnan@cyngn.com>
Date: Mon, 8 Feb 2016 11:43:57 -0800
Subject: [PATCH] CMSettingsProvider: Get rid of redundant qs tile defaults.

  If you've git blamed this commit because your build broke,
  move your default tiles overlay to

     `vendor/cmsdk/cm/res/res/values/config.xml`

  with the entry value of config_defaultQuickSettingsTiles

  TICKET: CYNGNOS-1908
Change-Id: Id721136ce669d420fde46322a339b9517b1a3677
---
 packages/CMSettingsProvider/res/values/defaults.xml    | 10 +++++++---
 .../org/cyanogenmod/cmsettings/CMDatabaseHelper.java   |  3 ++-
 .../tests/CMSettingsProviderDefaultsTest.java          |  3 ---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/CMSettingsProvider/res/values/defaults.xml b/packages/CMSettingsProvider/res/values/defaults.xml
index a503e5b..4957641 100644
--- a/packages/CMSettingsProvider/res/values/defaults.xml
+++ b/packages/CMSettingsProvider/res/values/defaults.xml
@@ -40,9 +40,13 @@
     <!-- Defaults for CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR -->
     <integer name="def_force_show_navbar">0</integer>
 
-    <!-- Default for CMSettings.Secure.QS_TILES
-         Comma-delimited, quick settings tiles. See QSConstants.java for a list of all available tiles -->
-    <string name="def_qs_tiles">wifi,bt,cell,airplane,rotation,flashlight,location,cast,hotspot,live_display</string>
+    <!-- THESE DEFAULTS COME FROM org.cyanogenmod.platform.internal's config_defaultQuickSettingsTiles
+         AND SHOULD BE OVERLAID THERE.
+
+         DO NOT USE:
+         Default for CMSettings.Secure.QS_TILES
+         Comma-delimited, quick settings tiles. See QSConstants.java for a list of all available tiles
+    <string name="def_qs_tiles">wifi,bt,cell,airplane,rotation,flashlight,location,cast,hotspot,live_display</string> -->
 
     <!-- Default for CMSettings.Secure.STATS_COLLECTION -->
     <bool name="def_stats_collection">false</bool>
diff --git a/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java b/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java
index c090b11..65ff3c0 100644
--- a/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java
+++ b/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java
@@ -249,7 +249,8 @@ public class CMDatabaseHelper extends SQLiteOpenHelper{
                     R.integer.def_force_show_navbar);
 
             loadStringSetting(stmt, CMSettings.Secure.QS_TILES,
-                    R.string.def_qs_tiles);
+                    org.cyanogenmod.platform.internal.
+                            R.string.config_defaultQuickSettingsTiles);
 
             loadBooleanSetting(stmt, CMSettings.Secure.QS_USE_MAIN_TILES,
                     R.bool.def_sysui_qs_main_tiles);
diff --git a/packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderDefaultsTest.java b/packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderDefaultsTest.java
index 0142b4f..b4fc655 100644
--- a/packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderDefaultsTest.java
+++ b/packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderDefaultsTest.java
@@ -98,9 +98,6 @@ public class CMSettingsProviderDefaultsTest extends AndroidTestCase {
         SECURE_SETTINGS_DEFAULTS.add(new Setting(
                 CMSettings.Secure.DEFAULT_THEME_PACKAGE,
                 "R.string.def_theme_package"));
-        SECURE_SETTINGS_DEFAULTS.add(new Setting(
-                CMSettings.Secure.QS_TILES,
-                "R.string.def_qs_tiles"));
         SECURE_SETTINGS_DEFAULTS.add(new Setting(
                 CMSettings.Secure.PROTECTED_COMPONENT_MANAGERS,
                 "R.string.def_protected_component_managers"));