Merge "Show the highlight for the wifi toggle switch."

2016-12-08 18:56:42 +00:00
parent 56a8c64c43 2a77408663
commit 1ff0a53529
2 changed files with 0 additions and 2 deletions
--- a/res/layout/switch_bar.xml
+++ b/res/layout/switch_bar.xml
@@ -43,7 +43,6 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_gravity="center_vertical"
-            android:background="@null"
            android:theme="@style/ThemeOverlay.SwitchBar.Settings" />

 </merge>
--- a/src/com/android/settings/widget/SwitchBar.java
+++ b/src/com/android/settings/widget/SwitchBar.java
@@ -117,7 +117,6 @@ public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedC
        lp = (MarginLayoutParams) mSwitch.getLayoutParams();
        lp.setMarginEnd(switchBarMarginEnd);
        setBackgroundColor(switchBarBackgroundColor);
-        mSwitch.setBackgroundColor(switchBarBackgroundColor);

        addOnSwitchChangeListener(new OnSwitchChangeListener() {
            @Override