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
This commit is contained in:
Adnan Begovic 2016-06-06 17:18:57 -07:00
parent cf8f5cefcb
commit 8cbdd2a58a

View File

@ -80,9 +80,6 @@ public class CMSettingsProviderDefaultsTest extends AndroidTestCase {
//SECURE //SECURE
static { 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( SECURE_SETTINGS_DEFAULTS.add(new Setting(
CMSettings.Secure.ADVANCED_MODE, CMSettings.Secure.ADVANCED_MODE,
"R.bool.def_advanced_mode")); "R.bool.def_advanced_mode"));
@ -120,6 +117,9 @@ public class CMSettingsProviderDefaultsTest extends AndroidTestCase {
GLOBAL_SETTINGS_DEFAULTS.add(new Setting( GLOBAL_SETTINGS_DEFAULTS.add(new Setting(
CMSettings.Global.WEATHER_TEMPERATURE_UNIT, CMSettings.Global.WEATHER_TEMPERATURE_UNIT,
"R.integer.def_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 @Override