am 353634a1: Merge "Update progress/seek bar assets. Add indeterminate horizontal progress bars for holo theme." into honeycomb
* commit '353634a1aaf20c974cae390d7fd263ffc9dabe21': Update progress/seek bar assets. Add indeterminate horizontal progress bars for holo theme.
|
Before Width: | Height: | Size: 313 B After Width: | Height: | Size: 178 B |
|
Before Width: | Height: | Size: 156 B After Width: | Height: | Size: 175 B |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 597 B |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 597 B |
|
Before Width: | Height: | Size: 163 B After Width: | Height: | Size: 188 B |
|
Before Width: | Height: | Size: 168 B After Width: | Height: | Size: 188 B |
BIN
core/res/res/drawable-hdpi/progressbar_indeterminate_holo1.png
Normal file
|
After Width: | Height: | Size: 2.7 KiB |
BIN
core/res/res/drawable-hdpi/progressbar_indeterminate_holo2.png
Normal file
|
After Width: | Height: | Size: 2.8 KiB |
BIN
core/res/res/drawable-hdpi/progressbar_indeterminate_holo3.png
Normal file
|
After Width: | Height: | Size: 2.8 KiB |
BIN
core/res/res/drawable-hdpi/progressbar_indeterminate_holo4.png
Normal file
|
After Width: | Height: | Size: 2.7 KiB |
BIN
core/res/res/drawable-hdpi/progressbar_indeterminate_holo5.png
Normal file
|
After Width: | Height: | Size: 2.7 KiB |
BIN
core/res/res/drawable-hdpi/progressbar_indeterminate_holo6.png
Normal file
|
After Width: | Height: | Size: 2.8 KiB |
BIN
core/res/res/drawable-hdpi/progressbar_indeterminate_holo7.png
Normal file
|
After Width: | Height: | Size: 2.8 KiB |
BIN
core/res/res/drawable-hdpi/progressbar_indeterminate_holo8.png
Normal file
|
After Width: | Height: | Size: 2.7 KiB |
BIN
core/res/res/drawable-hdpi/scrubber_control_disabled_holo.png
Normal file
|
After Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 3.0 KiB |
BIN
core/res/res/drawable-hdpi/scrubber_primary_holo.9.png
Normal file
|
After Width: | Height: | Size: 180 B |
BIN
core/res/res/drawable-hdpi/scrubber_secondary_holo.9.png
Normal file
|
After Width: | Height: | Size: 180 B |
|
Before Width: | Height: | Size: 316 B After Width: | Height: | Size: 176 B |
|
Before Width: | Height: | Size: 326 B After Width: | Height: | Size: 172 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 165 B |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 159 B |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 425 B |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 425 B |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 174 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 174 B |
BIN
core/res/res/drawable-mdpi/progressbar_indeterminate_holo1.png
Normal file
|
After Width: | Height: | Size: 1012 B |
BIN
core/res/res/drawable-mdpi/progressbar_indeterminate_holo2.png
Normal file
|
After Width: | Height: | Size: 1002 B |
BIN
core/res/res/drawable-mdpi/progressbar_indeterminate_holo3.png
Normal file
|
After Width: | Height: | Size: 1001 B |
BIN
core/res/res/drawable-mdpi/progressbar_indeterminate_holo4.png
Normal file
|
After Width: | Height: | Size: 960 B |
BIN
core/res/res/drawable-mdpi/progressbar_indeterminate_holo5.png
Normal file
|
After Width: | Height: | Size: 969 B |
BIN
core/res/res/drawable-mdpi/progressbar_indeterminate_holo6.png
Normal file
|
After Width: | Height: | Size: 956 B |
BIN
core/res/res/drawable-mdpi/progressbar_indeterminate_holo7.png
Normal file
|
After Width: | Height: | Size: 963 B |
BIN
core/res/res/drawable-mdpi/progressbar_indeterminate_holo8.png
Normal file
|
After Width: | Height: | Size: 958 B |
BIN
core/res/res/drawable-mdpi/scrubber_control_disabled_holo.png
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 157 B |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 159 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 167 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 160 B |
@@ -0,0 +1,30 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
/*
|
||||
** Copyright 2011, 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.
|
||||
*/
|
||||
-->
|
||||
<animation-list
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:oneshot="false">
|
||||
<item android:drawable="@drawable/progressbar_indeterminate_holo1" android:duration="50" />
|
||||
<item android:drawable="@drawable/progressbar_indeterminate_holo2" android:duration="50" />
|
||||
<item android:drawable="@drawable/progressbar_indeterminate_holo3" android:duration="50" />
|
||||
<item android:drawable="@drawable/progressbar_indeterminate_holo4" android:duration="50" />
|
||||
<item android:drawable="@drawable/progressbar_indeterminate_holo5" android:duration="50" />
|
||||
<item android:drawable="@drawable/progressbar_indeterminate_holo6" android:duration="50" />
|
||||
<item android:drawable="@drawable/progressbar_indeterminate_holo7" android:duration="50" />
|
||||
<item android:drawable="@drawable/progressbar_indeterminate_holo8" android:duration="50" />
|
||||
</animation-list>
|
||||
20
core/res/res/drawable/scrubber_control_selector_holo.xml
Normal file
@@ -0,0 +1,20 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2011 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.
|
||||
-->
|
||||
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_enabled="true" android:drawable="@android:drawable/scrubber_control_holo" />
|
||||
<item android:drawable="@android:drawable/scrubber_control_disabled_holo" />
|
||||
</selector>
|
||||
@@ -1511,6 +1511,7 @@
|
||||
|
||||
<style name="Widget.Holo.ProgressBar.Horizontal" parent="Widget.ProgressBar.Horizontal">
|
||||
<item name="android:progressDrawable">@android:drawable/progress_horizontal_holo_dark</item>
|
||||
<item name="android:indeterminateDrawable">@android:drawable/progress_indeterminate_horizontal_holo</item>
|
||||
<item name="android:minHeight">24dip</item>
|
||||
<item name="android:maxHeight">24dip</item>
|
||||
</style>
|
||||
@@ -1541,7 +1542,7 @@
|
||||
<item name="android:indeterminateDrawable">@android:drawable/scrubber_progress_horizontal_holo_dark</item>
|
||||
<item name="android:minHeight">13dip</item>
|
||||
<item name="android:maxHeight">13dip</item>
|
||||
<item name="android:thumb">@android:drawable/scrubber_control_holo</item>
|
||||
<item name="android:thumb">@android:drawable/scrubber_control_selector_holo</item>
|
||||
<item name="android:thumbOffset">16dip</item>
|
||||
<item name="android:focusable">true</item>
|
||||
</style>
|
||||
|
||||