From 76101714d71c40dcc453dde537272a58bd0c44c0 Mon Sep 17 00:00:00 2001 From: cretin45 Date: Fri, 20 Mar 2015 15:00:21 -0700 Subject: [PATCH] SetupWizard: Initialize the nav keys bundle boolean Change-Id: I50f2ef0fb7226c8b58437b669ca71df436d68ee8 (cherry picked from commit 33683fc2ce0d506c5c69726a112e768684676343) --- .../setupwizard/setup/CyanogenSettingsPage.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java b/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java index f92e753..7c75d10 100644 --- a/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java +++ b/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java @@ -203,7 +203,7 @@ public class CyanogenSettingsPage extends SetupPage { SetupWizardUtils.isSimMissing(context)); } - protected static boolean hideThemeSwitch(Context context) { + private static boolean hideThemeSwitch(Context context) { return ThemeUtils.getDefaultThemePackageName(context).equals(ThemeConfig.SYSTEM_DEFAULT); } @@ -395,12 +395,14 @@ public class CyanogenSettingsPage extends SetupPage { private void updateDisableNavkeysOption() { if (!mHideNavKeysRow) { + final Bundle myPageBundle = mPage.getData(); boolean enabled = Settings.Secure.getInt(getActivity().getContentResolver(), Settings.Secure.DEV_FORCE_SHOW_NAVBAR, 0) != 0; - boolean checked = mPage.getData().containsKey(KEY_ENABLE_NAV_KEYS) ? - mPage.getData().getBoolean(KEY_ENABLE_NAV_KEYS) : + boolean checked = myPageBundle.containsKey(KEY_ENABLE_NAV_KEYS) ? + myPageBundle.getBoolean(KEY_ENABLE_NAV_KEYS) : enabled; mNavKeys.setChecked(checked); + myPageBundle.putBoolean(KEY_ENABLE_NAV_KEYS, checked); } }