This CL is not working (even after careful testing) but when I tried I was not completely ToT.

Revert "Fix bug #15170508 When I initially load settings, all on/off toggles start in off position then move to on after pane loads"

This reverts commit 1e52db8063a0be2254097b4d85527a91d141b505.

Change-Id: I73bdfeba4a4b3e993e37cdae1e3733ffe272b9eb

1 files changed, 11 insertions, 8 deletions

diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java
index c1ebcb9..f104a06 100644
--- a/src/com/android/settings/print/PrintServiceSettingsFragment.java
+++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -112,6 +112,7 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
     };
 
     private SwitchBar mSwitchBar;
+    private ToggleSwitch mToggleSwitch;
 
     private String mPreferenceKey;
 
@@ -208,13 +209,13 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
         switch (which) {
             case DialogInterface.BUTTON_POSITIVE:
                 checked = true;
-                mSwitchBar.setSwitchChecked(checked);
+                mToggleSwitch.setCheckedInternal(checked);
                 getArguments().putBoolean(PrintSettingsFragment.EXTRA_CHECKED, checked);
                 onPreferenceToggled(mPreferenceKey, checked);
                 break;
             case DialogInterface.BUTTON_NEGATIVE:
                 checked = false;
-                mSwitchBar.setSwitchChecked(checked);
+                mToggleSwitch.setCheckedInternal(checked);
                 getArguments().putBoolean(PrintSettingsFragment.EXTRA_CHECKED, checked);
                 onPreferenceToggled(mPreferenceKey, checked);
                 break;
@@ -227,7 +228,7 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
         ListView listView = getListView();
         ViewGroup contentRoot = (ViewGroup) listView.getParent();
         View emptyView = listView.getEmptyView();
-        if (!mSwitchBar.isSwitchChecked()) {
+        if (!mToggleSwitch.isChecked()) {
             if (emptyView != null && emptyView.getId() != R.id.empty_print_state) {
                 contentRoot.removeView(emptyView);
                 emptyView = null;
@@ -276,10 +277,10 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
         List<ComponentName> services = PrintSettingsUtils.readEnabledPrintServices(getActivity());
         mServiceEnabled = services.contains(mComponentName);
         if (mServiceEnabled) {
-            mSwitchBar.setSwitchChecked(true);
+            mToggleSwitch.setCheckedInternal(true);
             mPrintersAdapter.enable();
         } else {
-            mSwitchBar.setSwitchChecked(false);
+            mToggleSwitch.setCheckedInternal(false);
             mPrintersAdapter.disable();
         }
         getActivity().invalidateOptionsMenu();
@@ -292,12 +293,14 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
         final SettingsActivity activity = (SettingsActivity) getActivity();
 
         mSwitchBar = activity.getSwitchBar();
-        mSwitchBar.setSwitchOnBeforeCheckedChangeListener(new ToggleSwitch.OnBeforeCheckedChangeListener() {
+
+        mToggleSwitch = mSwitchBar.getSwitch();
+        mToggleSwitch.setOnBeforeCheckedChangeListener(new ToggleSwitch.OnBeforeCheckedChangeListener() {
             @Override
             public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked) {
                 if (checked) {
                     if (!TextUtils.isEmpty(mEnableWarningMessage)) {
-                        mSwitchBar.setSwitchChecked(false);
+                        toggleSwitch.setCheckedInternal(false);
                         getArguments().putBoolean(PrintSettingsFragment.EXTRA_CHECKED, false);
                         showDialog(DIALOG_ID_ENABLE_WARNING);
                         return true;
@@ -328,7 +331,7 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
 
         // Enabled.
         final boolean enabled = arguments.getBoolean(PrintSettingsFragment.EXTRA_CHECKED);
-        mSwitchBar.setSwitchChecked(enabled);
+        mToggleSwitch.setCheckedInternal(enabled);
 
         // Settings title and intent.
         String settingsTitle = arguments.getString(PrintSettingsFragment.EXTRA_SETTINGS_TITLE);