From 82de8707af60e4afa6fa877cf205b45e84fc9f72 Mon Sep 17 00:00:00 2001
From: Fabrice Di Meglio <fdimeglio@google.com>
Date: Tue, 8 Apr 2014 18:58:33 -0700
Subject: [PATCH] Fix Switch button creation for PrintService

- setup the ActionBar switch in the onStart()

Change-Id: I92d8bb34dd7925da79a10fe01790131d22f7d0d8
---
 .../print/PrintServiceSettingsFragment.java   | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java
index d5bfce20ebf..3bba96359a9 100644
--- a/src/com/android/settings/print/PrintServiceSettingsFragment.java
+++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -62,7 +62,6 @@ import android.widget.SearchView;
 import android.widget.TextView;
 
 import com.android.settings.R;
-import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.print.PrintSettingsFragment.ToggleSwitch;
 import com.android.settings.print.PrintSettingsFragment.ToggleSwitch.OnBeforeCheckedChangeListener;
@@ -159,9 +158,15 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
         updateUiForArguments();
     }
 
+    @Override
+    public void onStart() {
+        super.onStart();
+        setupActionBarToggleSwitch(getActivity(), mToggleSwitch);
+    }
+
     @Override
     public void onDestroyView() {
-        getActivity().getActionBar().setCustomView(null);
+        removeActionBarToggleSwitch(getActivity());
         if (mOldActivityTitle != null) {
             getActivity().getActionBar().setTitle(mOldActivityTitle);
         }
@@ -289,7 +294,7 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
         mPrintersAdapter = new PrintersAdapter();
         mPrintersAdapter.registerDataSetObserver(mDataObserver);
 
-        mToggleSwitch = createAndAddActionBarToggleSwitch(getActivity());
+        mToggleSwitch = createActionBarToggleSwitch(getActivity());
         mToggleSwitch.setOnBeforeCheckedChangeListener(new OnBeforeCheckedChangeListener() {
             @Override
             public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked) {
@@ -440,18 +445,25 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
         }
     }
 
-    private ToggleSwitch createAndAddActionBarToggleSwitch(Activity activity) {
+    private ToggleSwitch createActionBarToggleSwitch(Activity activity) {
         ToggleSwitch toggleSwitch = new ToggleSwitch(activity);
         final int padding = activity.getResources().getDimensionPixelSize(
                 R.dimen.action_bar_switch_padding);
         toggleSwitch.setPaddingRelative(0, 0, padding, 0);
+        return toggleSwitch;
+    }
+
+    private void setupActionBarToggleSwitch(Activity activity, ToggleSwitch toggleSwitch) {
         activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
                 ActionBar.DISPLAY_SHOW_CUSTOM);
         activity.getActionBar().setCustomView(toggleSwitch,
                 new ActionBar.LayoutParams(ActionBar.LayoutParams.WRAP_CONTENT,
                         ActionBar.LayoutParams.WRAP_CONTENT,
                         Gravity.CENTER_VERTICAL | Gravity.END));
-        return toggleSwitch;
+    }
+
+    private void removeActionBarToggleSwitch(Activity activity) {
+        activity.getActionBar().setCustomView(null);
     }
 
     private static abstract class SettingsContentObserver extends ContentObserver {