CMSettingsProvider: Fix default setting for DEV_FORCE_SHOW_NAVBAR

* It has been moved to Global. Change-Id: I99dfa3742bd0c7963b4795b13afe5d4c8a0681c3
VanirAOSP · Mar 5, 2018 · 749a94b · 749a94b
1 parent 0114674
commit 749a94b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/packages/CMSettingsProvider/res/values/defaults.xml b/packages/CMSettingsProvider/res/values/defaults.xml
@@ -37,9 +37,6 @@
     <!-- Default for CMSettings.Secure.DEFAULT_THEME_PACKAGE -->
     <string name="def_theme_package"></string>
 
-    <!-- Defaults for CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR -->
-    <integer name="def_force_show_navbar">0</integer>
-
     <!-- THESE DEFAULTS COME FROM org.cyanogenmod.platform.internal's config_defaultQuickSettingsTiles
          AND SHOULD BE OVERLAID THERE.
 
@@ -82,6 +79,9 @@
          $1=MODEL -->
     <string name="def_device_name">%1$s</string>
 
+    <!-- Defaults for CMSettings.Global.DEV_FORCE_SHOW_NAVBAR -->
+    <integer name="def_force_show_navbar">0</integer>
+
     <!-- Default for CMSettings.Global.HEADS_UP_NOTIFICATIONS_ENABLED
          1==on -->
     <integer name="def_heads_up_enabled">1</integer>

diff --git a/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java b/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java
@@ -371,9 +371,6 @@ private void loadSecureSettings(SQLiteDatabase db) {
             loadRegionLockedStringSetting(stmt,
                     CMSettings.Secure.DEFAULT_THEME_PACKAGE, R.string.def_theme_package);
 
-            loadIntegerSetting(stmt, CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR,
-                    R.integer.def_force_show_navbar);
-
             loadStringSetting(stmt, CMSettings.Secure.QS_TILES,
                     org.cyanogenmod.platform.internal.
                             R.string.config_defaultQuickSettingsTiles);
@@ -454,6 +451,10 @@ private void loadGlobalSettings(SQLiteDatabase db) {
             stmt = db.compileStatement("INSERT OR IGNORE INTO global(name,value)"
                     + " VALUES(?,?);");
             // Global
+            loadIntegerSetting(stmt,
+                    CMSettings.Global.DEV_FORCE_SHOW_NAVBAR,
+                    R.integer.def_force_show_navbar);
+
             loadBooleanSetting(stmt,
                     CMSettings.Global.POWER_NOTIFICATIONS_ENABLED,
                     R.bool.def_power_notifications_enabled);