diff options
author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-05-15 15:20:12 -0700 |
---|---|---|
committer | Fabrice Di Meglio <fdimeglio@google.com> | 2014-05-15 15:20:12 -0700 |
commit | c2e2f77739ade726832c433063a075626ba316c4 (patch) | |
tree | acc93593d72ce4af9cdfb8a40405df93d9888273 /src/com/android/settings/DreamSettings.java | |
parent | c32b0eff7123482b0a879bda1e19959de83a8995 (diff) | |
download | packages_apps_Settings-c2e2f77739ade726832c433063a075626ba316c4.zip packages_apps_Settings-c2e2f77739ade726832c433063a075626ba316c4.tar.gz packages_apps_Settings-c2e2f77739ade726832c433063a075626ba316c4.tar.bz2 |
Use SwitchBar for Daydream Settings - a better way
- follow up CL to 41937766981423c9252e12e3319b2e7532739627
Related to bug #14898161 On/Off switches must move down from Action Bar
Change-Id: Ia8392f367ae956a2f805719971e0e1772f9234cd
Diffstat (limited to 'src/com/android/settings/DreamSettings.java')
-rw-r--r-- | src/com/android/settings/DreamSettings.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/com/android/settings/DreamSettings.java b/src/com/android/settings/DreamSettings.java index 7ef23e4..580c1fc 100644 --- a/src/com/android/settings/DreamSettings.java +++ b/src/com/android/settings/DreamSettings.java @@ -87,7 +87,6 @@ public class DreamSettings extends SettingsPreferenceFragment implements mBackend = new DreamBackend(activity); mSwitchBar = activity.getSwitchBar(); - mSwitchBar.addOnSwitchChangeListener(this); mSwitch = mSwitchBar.getSwitch(); setHasOptionsMenu(true); @@ -111,8 +110,6 @@ public class DreamSettings extends SettingsPreferenceFragment implements @Override public void onDestroyView() { logd("onDestroyView()"); - mSwitchBar.removeOnSwitchChangeListener(this); - mSwitchBar.hide(); super.onDestroyView(); } @@ -130,8 +127,6 @@ public class DreamSettings extends SettingsPreferenceFragment implements mAdapter = new DreamInfoAdapter(mContext); listView.setAdapter(mAdapter); - - mSwitchBar.show(); } @Override @@ -217,7 +212,11 @@ public class DreamSettings extends SettingsPreferenceFragment implements public void onPause() { logd("onPause()"); super.onPause(); + mContext.unregisterReceiver(mPackageReceiver); + + mSwitchBar.removeOnSwitchChangeListener(this); + mSwitchBar.hide(); } @Override @@ -234,6 +233,9 @@ public class DreamSettings extends SettingsPreferenceFragment implements filter.addAction(Intent.ACTION_PACKAGE_REPLACED); filter.addDataScheme(PACKAGE_SCHEME); mContext.registerReceiver(mPackageReceiver , filter); + + mSwitchBar.addOnSwitchChangeListener(this); + mSwitchBar.show(); } public static int getSummaryResource(Context context) { |