From ffc0dbd2fbba0b4fe5c9c19f481ba815c31c6d4f Mon Sep 17 00:00:00 2001 From: emancebo Date: Fri, 22 May 2015 16:59:25 -0700 Subject: [PATCH] SetupWizard: add overlay to uncheck cyanogen theme option by default Change-Id: I278dcb3b2d8099b71a66d90250c40836dd8ec7fc (cherry picked from commit 7a255f6e5c34b7abe49333eb8f623904a8576a67) --- res/values/config.xml | 1 + .../setupwizard/setup/CyanogenSettingsPage.java | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/res/values/config.xml b/res/values/config.xml index dda669e..e2e8c8f 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -20,4 +20,5 @@ 0 + true diff --git a/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java b/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java index d751461..dbfd439 100644 --- a/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java +++ b/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java @@ -413,9 +413,13 @@ public class CyanogenSettingsPage extends SetupPage { private void updateThemeOption() { if (!mHideThemeRow) { final Bundle myPageBundle = mPage.getData(); - boolean themesChecked = - !myPageBundle.containsKey(KEY_APPLY_DEFAULT_THEME) || myPageBundle - .getBoolean(KEY_APPLY_DEFAULT_THEME); + boolean themesChecked; + if (myPageBundle.containsKey(KEY_APPLY_DEFAULT_THEME)) { + themesChecked = myPageBundle.getBoolean(KEY_APPLY_DEFAULT_THEME); + } else { + themesChecked = getActivity().getResources().getBoolean( + R.bool.check_custom_theme_by_default); + } mDefaultTheme.setChecked(themesChecked); myPageBundle.putBoolean(KEY_APPLY_DEFAULT_THEME, themesChecked); }