OSDN Git Service

Fix bug #15109661 Settings crash after tap on back key from print settings
authorFabrice Di Meglio <fdimeglio@google.com>
Tue, 20 May 2014 19:26:16 +0000 (12:26 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 20 May 2014 21:59:34 +0000 (14:59 -0700)
- use onResume() / onPause() for adding / removing the SwitchChangeListener

Change-Id: Ia3a4ff57075d2668e446df4f4f09e4593cc34761

src/com/android/settings/print/PrintServiceSettingsFragment.java

index 3e1dd0f..f104a06 100644 (file)
@@ -143,12 +143,16 @@ 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
@@ -159,19 +163,10 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
     }
 
     @Override
-    public void onStart() {
-        super.onStart();
-        mSwitchBar.addOnSwitchChangeListener(this);
-        mSwitchBar.show();
-    }
-
-    @Override
     public void onDestroyView() {
         if (mOldActivityTitle != null) {
             getActivity().getActionBar().setTitle(mOldActivityTitle);
         }
-        mSwitchBar.removeOnSwitchChangeListener(this);
-        mSwitchBar.hide();
         super.onDestroyView();
     }