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

2 files changed, 4 insertions, 40 deletions

diff --git a/src/com/android/settings/widget/SwitchBar.java b/src/com/android/settings/widget/SwitchBar.java
index 1675f2a..40c8481 100644
--- a/src/com/android/settings/widget/SwitchBar.java
+++ b/src/com/android/settings/widget/SwitchBar.java
@@ -84,7 +84,10 @@ public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedC
 
         // Default is hide
         setVisibility(View.GONE);
-        mSwitch.setVisibility(View.GONE);
+    }
+
+    public ToggleSwitch getSwitch() {
+        return mSwitch;
     }
 
     public void show() {
@@ -122,39 +125,4 @@ public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedC
         }
         mSwitchChangeListeners.remove(listener);
     }
-
-    public void setSwitchOnBeforeCheckedChangeListener(
-            ToggleSwitch.OnBeforeCheckedChangeListener listener) {
-        mSwitch.setOnBeforeCheckedChangeListener(listener);
-    }
-
-    public void setSwitchChecked(boolean checked) {
-        setSwitchChecked(checked, false);
-    }
-
-    public void setSwitchChecked(boolean checked, boolean checkBefore) {
-        if (checkBefore) {
-            ToggleSwitch.OnBeforeCheckedChangeListener listener =
-                    mSwitch.getOnBeforeCheckedChangeListener();
-            if (listener != null && listener.onBeforeCheckedChanged(mSwitch, checked)) {
-                return;
-            }
-
-        }
-        mSwitch.setCheckedInternal(checked);
-        if (mSwitch.getVisibility() == View.GONE) {
-            mSwitch.setVisibility(View.VISIBLE);
-        }
-    }
-
-    public void setSwitchEnabled(boolean enabled) {
-        mSwitch.setEnabled(enabled);
-        if (mSwitch.getVisibility() == View.GONE) {
-            mSwitch.setVisibility(View.VISIBLE);
-        }
-    }
-
-    public boolean isSwitchChecked() {
-        return mSwitch.isChecked();
-    }
 }
diff --git a/src/com/android/settings/widget/ToggleSwitch.java b/src/com/android/settings/widget/ToggleSwitch.java
index ab0c37e..8232ff1 100644
--- a/src/com/android/settings/widget/ToggleSwitch.java
+++ b/src/com/android/settings/widget/ToggleSwitch.java
@@ -48,10 +48,6 @@ public class ToggleSwitch extends Switch {
         mOnBeforeListener = listener;
     }
 
-    public OnBeforeCheckedChangeListener getOnBeforeCheckedChangeListener() {
-        return mOnBeforeListener;
-    }
-
     @Override
     public void setChecked(boolean checked) {
         if (mOnBeforeListener != null