From c2e2f77739ade726832c433063a075626ba316c4 Mon Sep 17 00:00:00 2001
From: Fabrice Di Meglio <fdimeglio@google.com>
Date: Thu, 15 May 2014 15:20:12 -0700
Subject: [PATCH] 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
---
 src/com/android/settings/DreamSettings.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/com/android/settings/DreamSettings.java b/src/com/android/settings/DreamSettings.java
index 7ef23e40001..580c1fc312f 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) {