diff options
author | cretin45 <cretin45@gmail.com> | 2015-03-19 09:46:17 -0700 |
---|---|---|
committer | Ed Carrigan <cretin45@gmail.com> | 2015-04-01 02:01:32 +0000 |
commit | d0389e4e6ec9bfaaf2e95b5c2c2afde029fd4571 (patch) | |
tree | 6cde55479671d81abccf2d0e5d63bd83adbbd1ac | |
parent | dbc1ceb8ca97143a0067c2b97ca14a68fb789f69 (diff) | |
download | packages_apps_SetupWizard-d0389e4e6ec9bfaaf2e95b5c2c2afde029fd4571.zip packages_apps_SetupWizard-d0389e4e6ec9bfaaf2e95b5c2c2afde029fd4571.tar.gz packages_apps_SetupWizard-d0389e4e6ec9bfaaf2e95b5c2c2afde029fd4571.tar.bz2 |
SetupWizard: Fix regression, only init pages once
Change-Id: I1207cb3975daa752a66eb8e9e40635f9a8009509
(cherry picked from commit 83be05d6ecf435be562f397e98e0ad61e5974ecd)
-rw-r--r-- | src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java | 46 | ||||
-rw-r--r-- | src/com/cyanogenmod/setupwizard/ui/SetupPageFragment.java | 2 |
2 files changed, 31 insertions, 17 deletions
diff --git a/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java b/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java index e2e7ded..3b13d7a 100644 --- a/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java +++ b/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java @@ -257,7 +257,6 @@ public class CyanogenSettingsPage extends SetupPage { @Override protected void initializePage() { - final Bundle myPageBundle = mPage.getData(); String privacy_policy = getString(R.string.services_privacy_policy); String policySummary = getString(R.string.services_explanation, privacy_policy); SpannableString ss = new SpannableString(policySummary); @@ -288,11 +287,6 @@ public class CyanogenSettingsPage extends SetupPage { TextView metrics = (TextView) mRootView.findViewById(R.id.enable_metrics_summary); metrics.setText(metricsSpan); mMetrics = (CheckBox) mRootView.findViewById(R.id.enable_metrics_checkbox); - boolean metricsChecked = - !myPageBundle.containsKey(KEY_SEND_METRICS) || myPageBundle - .getBoolean(KEY_SEND_METRICS); - mMetrics.setChecked(metricsChecked); - myPageBundle.putBoolean(KEY_SEND_METRICS, metricsChecked); mDefaultThemeRow = mRootView.findViewById(R.id.theme); if (hideThemeSwitch(getActivity())) { @@ -311,11 +305,6 @@ public class CyanogenSettingsPage extends SetupPage { TextView theme = (TextView) mRootView.findViewById(R.id.enable_theme_summary); theme.setText(themeSpan); mDefaultTheme = (CheckBox) mRootView.findViewById(R.id.enable_theme_checkbox); - boolean themesChecked = - !myPageBundle.containsKey(KEY_APPLY_DEFAULT_THEME) || myPageBundle - .getBoolean(KEY_APPLY_DEFAULT_THEME); - mDefaultTheme.setChecked(themesChecked); - myPageBundle.putBoolean(KEY_APPLY_DEFAULT_THEME, themesChecked); } mNavKeysRow = mRootView.findViewById(R.id.nav_keys); @@ -350,11 +339,6 @@ public class CyanogenSettingsPage extends SetupPage { mSecureSmsRow.setVisibility(View.GONE); } mSecureSms = (CheckBox) mRootView.findViewById(R.id.secure_sms_checkbox); - boolean smsChecked = myPageBundle.containsKey(KEY_REGISTER_WHISPERPUSH) ? - myPageBundle.getBoolean(KEY_REGISTER_WHISPERPUSH) : - false; - mSecureSms.setChecked(smsChecked); - myPageBundle.putBoolean(KEY_REGISTER_WHISPERPUSH, smsChecked); } @Override @@ -366,6 +350,36 @@ public class CyanogenSettingsPage extends SetupPage { public void onResume() { super.onResume(); updateDisableNavkeysOption(); + updateMetricsOption(); + updateThemeOption(); + updateSmsOption(); + } + + private void updateMetricsOption() { + final Bundle myPageBundle = mPage.getData(); + boolean metricsChecked = + !myPageBundle.containsKey(KEY_SEND_METRICS) || myPageBundle + .getBoolean(KEY_SEND_METRICS); + mMetrics.setChecked(metricsChecked); + myPageBundle.putBoolean(KEY_SEND_METRICS, metricsChecked); + } + + private void updateThemeOption() { + final Bundle myPageBundle = mPage.getData(); + boolean themesChecked = + !myPageBundle.containsKey(KEY_APPLY_DEFAULT_THEME) || myPageBundle + .getBoolean(KEY_APPLY_DEFAULT_THEME); + mDefaultTheme.setChecked(themesChecked); + myPageBundle.putBoolean(KEY_APPLY_DEFAULT_THEME, themesChecked); + } + + private void updateSmsOption() { + final Bundle myPageBundle = mPage.getData(); + boolean smsChecked = myPageBundle.containsKey(KEY_REGISTER_WHISPERPUSH) ? + myPageBundle.getBoolean(KEY_REGISTER_WHISPERPUSH) : + false; + mSecureSms.setChecked(smsChecked); + myPageBundle.putBoolean(KEY_REGISTER_WHISPERPUSH, smsChecked); } private void updateDisableNavkeysOption() { diff --git a/src/com/cyanogenmod/setupwizard/ui/SetupPageFragment.java b/src/com/cyanogenmod/setupwizard/ui/SetupPageFragment.java index 3c85f5a..93b349c 100644 --- a/src/com/cyanogenmod/setupwizard/ui/SetupPageFragment.java +++ b/src/com/cyanogenmod/setupwizard/ui/SetupPageFragment.java @@ -58,6 +58,7 @@ public abstract class SetupPageFragment extends Fragment { mRootView = inflater.inflate(getLayoutResource(), container, false); mTitleView = (TextView) mRootView.findViewById(android.R.id.title); mHeaderView = (ViewGroup ) mRootView.findViewById(R.id.header); + initializePage(); return mRootView; } @@ -83,7 +84,6 @@ public abstract class SetupPageFragment extends Fragment { if (mTitleView != null) { mTitleView.setText(mPage.getTitleResId()); } - initializePage(); mCallbacks.onPageLoaded(mPage); getActivity().startPostponedEnterTransition(); } |