From 4b0912d4903d81e7ce8a45dd694b1ae01fe438c1 Mon Sep 17 00:00:00 2001
From: Joe Onorato <joeo@google.com>
Date: Wed, 8 Dec 2010 15:38:07 -0800
Subject: [PATCH] Make the ToggleSlider in the status bar settings panel show
 the right track when it's disabled.

Change-Id: Iead2a7f93dd312254d715f010ccca50cdcda5d00
---
 .../scrubber_track_holo_dark.9.png            | Bin 0 -> 1116 bytes
 .../status_bar_settings_slider_disabled.xml   |  29 ++++++++++++++++++
 .../statusbar/policy/ToggleSlider.java        |   7 ++++-
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 packages/SystemUI/res/drawable-mdpi/scrubber_track_holo_dark.9.png
 create mode 100644 packages/SystemUI/res/drawable/status_bar_settings_slider_disabled.xml

diff --git a/packages/SystemUI/res/drawable-mdpi/scrubber_track_holo_dark.9.png b/packages/SystemUI/res/drawable-mdpi/scrubber_track_holo_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..baf70cd84977cf1427b560ac07ce3e57ee7893f1
GIT binary patch
literal 1116
zcmbVMPiWIn7!N9A3?~CYP<DtJf(M(tm!?e<R%h2Vu3)#(7B){VOJ3KoB`+p#w%r6}
zC~V?kC_@A<dQd@}Cqa<mPy`jh%T6jf6k!KZVd6>Amu{UN#t!C?_kAzl@Av)BOn>ju
z)|P!O48yc$d$c?~cZG6u6MbKOd*Tc|_L9sXDc};R7(QZB79K`y)-gs<9vN2c<a5-?
zFxyLZagYq=j;SVgcq6potByy}4Aa?F^$c?q5q21j*lv>h`tT9Q+E$Vqh~+@eOQW*g
zGvTAcL~qfY7&R4(>pIMKR#i&iAY!mpXUq-MYLct-s#FfI1&*zokkKT!7Sv#_pG{*Q
zu`wP*Ob`cb9P%(K$+CQi6#)bS5CtekpsYqk6##bq;ixy?Dyex*U-w0|Bv&THQw5<?
zsqmF3kNpt=DvA<vh+>3VM1q=2jB3OUIvNZb3QXVjh>cw~WHg5HI7xCe(zO&EFPGaO
zc7ydo(UJ*O!xJD61jh;Us#^ynkN$?SsdZ4Sc}U2k0FV17?MJDj0j9Ov+EHjoqfz^O
zn>NK5)37=2AeUsdBuBsSmTjq`q$i?MLIF_`#uJdHFQro{MF9yNDzXF{9GhWfS(KGT
zJg&zy9YRg-jz_zdR7_DaQ8AOyKm(g~17f%)YWTIO-*s$kORSpqkwLIu#CWVR0sUo6
za8Sk`n=ZuIoMGB-sE6%Y%T`0aeF|B+j~%vNU)A2kKY$4Up)3Je1ogb-R7?YkuBBoC
z#>3dxu-5<7OrXIC;c)yjER8EVfuXoD`c&Ci9^}%E@#$);_UQ^;tBYAJRjj_gmVeWF
zmfblv^ZWC1le@g)E;oHy+;RWu)Q<8I!EXLO-#0tGxQ)B8d$RpjZ(&q@QEs<BJ-IX2
zJp6JYf8hADD|b6?@BdIZH~&JK8sHy%XI7`*p6`&l`H_1!C#A<XYPjus^q{9+`*wY4
wc5(^6ntng`^WDeGvu%gDQv2zLO_x^o3^6r5^Wn$Bukb&@WHY_meD~1Q9~<dxHvj+t

literal 0
HcmV?d00001

diff --git a/packages/SystemUI/res/drawable/status_bar_settings_slider_disabled.xml b/packages/SystemUI/res/drawable/status_bar_settings_slider_disabled.xml
new file mode 100644
index 0000000000000..17d48b79d9135
--- /dev/null
+++ b/packages/SystemUI/res/drawable/status_bar_settings_slider_disabled.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background"
+            android:drawable="@*android:drawable/scrubber_track_holo_dark" />
+    <item android:id="@android:id/secondaryProgress">
+        <scale android:scaleWidth="100%"
+                android:drawable="@*android:drawable/scrubber_track_holo_dark" />
+    </item>
+    <item android:id="@android:id/progress">
+        <scale android:scaleWidth="100%"
+                android:drawable="@*android:drawable/scrubber_track_holo_dark" />
+    </item>
+</layer-list>
+
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/ToggleSlider.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/ToggleSlider.java
index 46207ee8f1562..0eb2be6f1b1bb 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/ToggleSlider.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/ToggleSlider.java
@@ -24,10 +24,10 @@ import android.util.AttributeSet;
 import android.util.Slog;
 import android.view.View;
 import android.widget.CompoundButton;
+import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.SeekBar;
 import android.widget.TextView;
-import android.widget.CompoundButton;
 
 import com.android.systemui.R;
 
@@ -77,13 +77,18 @@ public class ToggleSlider extends RelativeLayout
 
     public void onCheckedChanged(CompoundButton toggle, boolean checked) {
         Drawable thumb;
+        Drawable slider;
         final Resources res = getContext().getResources();
         if (checked) {
             thumb = res.getDrawable(R.drawable.scrubber_control_disabled_holo);
+            slider = res.getDrawable(R.drawable.status_bar_settings_slider_disabled);
         } else {
             thumb = res.getDrawable(R.drawable.scrubber_control_holo);
+            slider = res.getDrawable(
+                    com.android.internal.R.drawable.scrubber_progress_horizontal_holo_dark);
         }
         mSlider.setThumb(thumb);
+        mSlider.setProgressDrawable(slider);
 
         if (mListener != null) {
             mListener.onChanged(this, mTracking, checked, mSlider.getProgress());