commit a7dc76f3ad20b891921ce1e07d106b93f29c4323
author Fabrice Di Meglio <fdimeglio@google.com> Thu May 15 22:25:33 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 15 22:25:34 2014 +0000
tree 758f71f14aacfd62f5f5dce08ba3f88f0f6a8002
parent 7334cc84b6e381041d35ef817dda2e1cc36d5619
parent c2e2f77739ade726832c433063a075626ba316c4

Merge "Use SwitchBar for Daydream Settings - a better way"

src/com/android/settings/DreamSettings.java

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 @@
         mBackend = new DreamBackend(activity);
 
         mSwitchBar = activity.getSwitchBar();
-        mSwitchBar.addOnSwitchChangeListener(this);
         mSwitch = mSwitchBar.getSwitch();
 
         setHasOptionsMenu(true);
@@ -111,8 +110,6 @@
     @Override
     public void onDestroyView() {
         logd("onDestroyView()");
-        mSwitchBar.removeOnSwitchChangeListener(this);
-        mSwitchBar.hide();
         super.onDestroyView();
     }
 
@@ -130,8 +127,6 @@
 
         mAdapter = new DreamInfoAdapter(mContext);
         listView.setAdapter(mAdapter);
-
-        mSwitchBar.show();
     }
 
     @Override
@@ -217,7 +212,11 @@
     public void onPause() {
         logd("onPause()");
         super.onPause();
+
         mContext.unregisterReceiver(mPackageReceiver);
+
+        mSwitchBar.removeOnSwitchChangeListener(this);
+        mSwitchBar.hide();
     }
 
     @Override
@@ -234,6 +233,9 @@
         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) {