From 5c6b56138f1f9abc7786e8925dbe624e826ea810 Mon Sep 17 00:00:00 2001
From: LuK1337 <priv.luk@gmail.com>
Date: Fri, 23 Feb 2018 20:54:49 +0100
Subject: [PATCH] LineageSettingsProvider: Fix default setting for
 DEV_FORCE_SHOW_NAVBAR

* It has been moved to Global.

Change-Id: I99dfa3742bd0c7963b4795b13afe5d4c8a0681c3
---
 packages/LineageSettingsProvider/res/values/defaults.xml   | 6 +++---
 .../lineageos/lineagesettings/LineageDatabaseHelper.java   | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/LineageSettingsProvider/res/values/defaults.xml b/packages/LineageSettingsProvider/res/values/defaults.xml
index 0a828f19..81a6cc6d 100644
--- a/packages/LineageSettingsProvider/res/values/defaults.xml
+++ b/packages/LineageSettingsProvider/res/values/defaults.xml
@@ -31,9 +31,6 @@
     <!-- Default for LineageSettings.Secure.ADVANCED_MODE -->
     <bool name="def_advanced_mode">true</bool>
 
-    <!-- Defaults for LineageSettings.Secure.DEV_FORCE_SHOW_NAVBAR -->
-    <integer name="def_force_show_navbar">0</integer>
-
     <!-- Default for LineageSettings.Secure.STATS_COLLECTION -->
     <bool name="def_stats_collection">false</bool>
 
@@ -65,6 +62,9 @@
          $1=MODEL -->
     <string name="def_device_name">%1$s</string>
 
+    <!-- Defaults for LineageSettings.Global.DEV_FORCE_SHOW_NAVBAR -->
+    <integer name="def_force_show_navbar">0</integer>
+
     <!-- Default for LineageSettings.Global.HEADS_UP_NOTIFICATIONS_ENABLED
          1==on -->
     <integer name="def_heads_up_enabled">1</integer>
diff --git a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java
index e9afe723..3c1e7c36 100644
--- a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java
+++ b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java
@@ -410,9 +410,6 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{
             loadBooleanSetting(stmt, LineageSettings.Secure.ADVANCED_MODE,
                     R.bool.def_advanced_mode);
 
-            loadIntegerSetting(stmt, LineageSettings.Secure.DEV_FORCE_SHOW_NAVBAR,
-                    R.integer.def_force_show_navbar);
-
             loadBooleanSetting(stmt, LineageSettings.Secure.STATS_COLLECTION,
                     R.bool.def_stats_collection);
 
@@ -488,6 +485,10 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{
             stmt = db.compileStatement("INSERT OR IGNORE INTO global(name,value)"
                     + " VALUES(?,?);");
             // Global
+            loadIntegerSetting(stmt,
+                    LineageSettings.Global.DEV_FORCE_SHOW_NAVBAR,
+                    R.integer.def_force_show_navbar);
+
             loadBooleanSetting(stmt,
                     LineageSettings.Global.POWER_NOTIFICATIONS_ENABLED,
                     R.bool.def_power_notifications_enabled);