From 8cbdd2a58a43d13cebe08a1a675e70be09af0fa2 Mon Sep 17 00:00:00 2001
From: Adnan Begovic <adnan@cyngn.com>
Date: Mon, 6 Jun 2016 17:18:57 -0700
Subject: [PATCH] CMSettingsProvider: Fix defaults test for
 DEV_FORCE_SHOW_NAVBAR.

  Since DEV_FORCE_SHOW_NAVBAR was moved to global, the test needs
  to query its value there.

TICKET: CYNGNOS-3016
Change-Id: Ided274ec065ec989b4ca4f172ec569adb74cbfd5
---
 .../cmsettings/tests/CMSettingsProviderDefaultsTest.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 b30b853..568949c 100644
--- a/packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderDefaultsTest.java
+++ b/packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderDefaultsTest.java
@@ -80,9 +80,6 @@ public class CMSettingsProviderDefaultsTest extends AndroidTestCase {
 
     //SECURE
     static {
-        SECURE_SETTINGS_DEFAULTS.add(new Setting(
-                CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR,
-                "R.integer.def_force_show_navbar"));
         SECURE_SETTINGS_DEFAULTS.add(new Setting(
                 CMSettings.Secure.ADVANCED_MODE,
                 "R.bool.def_advanced_mode"));
@@ -120,6 +117,9 @@ public class CMSettingsProviderDefaultsTest extends AndroidTestCase {
         GLOBAL_SETTINGS_DEFAULTS.add(new Setting(
                 CMSettings.Global.WEATHER_TEMPERATURE_UNIT,
                 "R.integer.def_temperature_unit"));
+        GLOBAL_SETTINGS_DEFAULTS.add(new Setting(
+                CMSettings.Global.DEV_FORCE_SHOW_NAVBAR,
+                "R.integer.def_force_show_navbar"));
     }
 
     @Override