Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Adding selected state for scrubber control"" into ics-factoryrom

Browse Source
This commit is contained in:
Justin Ho
2011-09-16 14:47:54 -07:00
committed by Android (Google) Code Review
parent 5855c0ca68 783ed0d647
commit 218148f1ff
16 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/res/res/drawable-hdpi/scrubber_control_disabled_holo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 851 B

After

Width:  |  Height:  |  Size: 424 B

BIN
core/res/res/drawable-hdpi/scrubber_control_focused_holo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

BIN
core/res/res/drawable-hdpi/scrubber_control_holo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 468 B

BIN
core/res/res/drawable-hdpi/scrubber_control_normal_holo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
core/res/res/drawable-hdpi/scrubber_control_pressed_holo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
core/res/res/drawable-mdpi/scrubber_control_disabled_holo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 650 B

After

Width:  |  Height:  |  Size: 387 B

BIN
core/res/res/drawable-mdpi/scrubber_control_focused_holo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 993 B

BIN
core/res/res/drawable-mdpi/scrubber_control_holo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 420 B

BIN
core/res/res/drawable-mdpi/scrubber_control_normal_holo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 822 B

BIN
core/res/res/drawable-mdpi/scrubber_control_pressed_holo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
core/res/res/drawable-xhdpi/scrubber_control_disabled_holo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 498 B

BIN
core/res/res/drawable-xhdpi/scrubber_control_focused_holo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.1 KiB

BIN
core/res/res/drawable-xhdpi/scrubber_control_holo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 586 B

BIN
core/res/res/drawable-xhdpi/scrubber_control_normal_holo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.5 KiB

BIN
core/res/res/drawable-xhdpi/scrubber_control_pressed_holo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

7
core/res/res/drawable/scrubber_control_selector_holo.xml
View File

@@ -15,8 +15,7 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:drawable="@android:drawable/scrubber_control_disabled_holo" />
<item android:state_pressed="true" android:drawable="@android:drawable/scrubber_control_pressed_holo" />
<item android:state_selected="true" android:drawable="@android:drawable/scrubber_control_selected_holo" />
<item android:drawable="@android:drawable/scrubber_control_normal_holo" />
<item android:state_pressed="true" android:state_enabled="true" android:drawable="@android:drawable/scrubber_control_pressed_holo" />
<item android:state_enabled="true" android:drawable="@android:drawable/scrubber_control_holo" />
<item android:drawable="@android:drawable/scrubber_control_disabled_holo" />
</selector>