drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use platform assets for brightness scrubber." into ics-mr1

Browse Source
This commit is contained in:
Daniel Sandler
2011-11-09 20:41:03 -08:00
committed by Android (Google) Code Review
parent 08b3ffe611 e989b32b3a
commit bca520a170
10 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
packages/SystemUI/res/drawable-hdpi/scrubber_control_disabled_holo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.2 KiB

BIN
packages/SystemUI/res/drawable-hdpi/scrubber_control_holo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.6 KiB

BIN
packages/SystemUI/res/drawable-hdpi/scrubber_track_holo_dark.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 250 B

BIN
packages/SystemUI/res/drawable-mdpi/scrubber_control_disabled_holo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
packages/SystemUI/res/drawable-mdpi/scrubber_control_holo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

BIN
packages/SystemUI/res/drawable-mdpi/scrubber_track_holo_dark.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 157 B

BIN
packages/SystemUI/res/drawable-xhdpi/scrubber_control_disabled_holo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.6 KiB

BIN
packages/SystemUI/res/drawable-xhdpi/scrubber_control_holo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.6 KiB

BIN
packages/SystemUI/res/drawable-xhdpi/scrubber_track_holo_dark.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 571 B

9
packages/SystemUI/src/com/android/systemui/statusbar/policy/ToggleSlider.java
View File

@ -80,10 +80,13 @@ public class ToggleSlider extends RelativeLayout
Drawable slider; Drawable slider;
final Resources res = getContext().getResources(); final Resources res = getContext().getResources();
if (checked) { if (checked) {
thumb = res.getDrawable(R.drawable.scrubber_control_disabled_holo); thumb = res.getDrawable(
slider = res.getDrawable(R.drawable.status_bar_settings_slider_disabled); com.android.internal.R.drawable.scrubber_control_disabled_holo);
slider = res.getDrawable(
R.drawable.status_bar_settings_slider_disabled);
} else { } else {
thumb = res.getDrawable(R.drawable.scrubber_control_holo); thumb = res.getDrawable(
com.android.internal.R.drawable.scrubber_control_selector_holo);
slider = res.getDrawable( slider = res.getDrawable(
com.android.internal.R.drawable.scrubber_progress_horizontal_holo_dark); com.android.internal.R.drawable.scrubber_progress_horizontal_holo_dark);
} }