diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-06-12 15:46:41 -0700 |
|---|---|---|
| committer | Fabrice Di Meglio <fdimeglio@google.com> | 2014-06-12 15:46:41 -0700 |
| commit | 204521626f63bef4a8ac2d76334b94dbb0f3aa3b (patch) | |
| tree | c3e6b3dc0d76ba02cdec23a8ce57d8f6e6a1cba0 /src/com/android/settings/print | |
| parent | 524a63b493c2c9692dd09669173c96e69e09297c (diff) | |
| parent | f9360dbcef1ac3355036724a74e9ca29e6475b37 (diff) | |
| download | packages_apps_Settings-204521626f63bef4a8ac2d76334b94dbb0f3aa3b.zip packages_apps_Settings-204521626f63bef4a8ac2d76334b94dbb0f3aa3b.tar.gz packages_apps_Settings-204521626f63bef4a8ac2d76334b94dbb0f3aa3b.tar.bz2 | |
resolved conflicts for merge of f9360dbc to master
Change-Id: I2e468d83a7ce5200c59f63b4362e7bee10d0a2eb
Diffstat (limited to 'src/com/android/settings/print')
| -rw-r--r-- | src/com/android/settings/print/PrintServiceSettingsFragment.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java index 08b1a64..7af6338 100644 --- a/src/com/android/settings/print/PrintServiceSettingsFragment.java +++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java @@ -143,16 +143,12 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment mSettingsContentObserver.register(getContentResolver()); updateEmptyView(); updateUiForServiceState(); - mSwitchBar.addOnSwitchChangeListener(this); - mSwitchBar.show(); } @Override public void onPause() { mSettingsContentObserver.unregister(getContentResolver()); super.onPause(); - mSwitchBar.removeOnSwitchChangeListener(this); - mSwitchBar.hide(); } @Override @@ -168,6 +164,8 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment getActivity().getActionBar().setTitle(mOldActivityTitle); } super.onDestroyView(); + mSwitchBar.removeOnSwitchChangeListener(this); + mSwitchBar.hide(); } private void onPreferenceToggled(String preferenceKey, boolean enabled) { @@ -292,6 +290,8 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment final SettingsActivity activity = (SettingsActivity) getActivity(); mSwitchBar = activity.getSwitchBar(); + mSwitchBar.addOnSwitchChangeListener(this); + mSwitchBar.show(); mToggleSwitch = mSwitchBar.getSwitch(); mToggleSwitch.setOnBeforeCheckedChangeListener(new ToggleSwitch.OnBeforeCheckedChangeListener() { |