diff options
| author | Alan Viverette <alanv@google.com> | 2015-02-05 03:35:27 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-02-05 03:35:27 +0000 |
| commit | 6708ac40f29c2437d3cb67ffa7604aecbdad1fe7 (patch) | |
| tree | 76be347ecf2484ed6f7b3d6589c1930e62ed6068 /core/res | |
| parent | 6bafb866554a7dea0844438c27a7caea0aab83f2 (diff) | |
| parent | bac8e12ebd8ed143cd2f1974280f0495c837def4 (diff) | |
| download | frameworks_base-6708ac40f29c2437d3cb67ffa7604aecbdad1fe7.zip frameworks_base-6708ac40f29c2437d3cb67ffa7604aecbdad1fe7.tar.gz frameworks_base-6708ac40f29c2437d3cb67ffa7604aecbdad1fe7.tar.bz2 | |
Move layer-list to be top-level element in seek bar progress
automerge: bac8e12
* commit 'bac8e12ebd8ed143cd2f1974280f0495c837def4':
Move layer-list to be top-level element in seek bar progress
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/drawable/scrubber_progress_horizontal_material.xml | 48 |
1 files changed, 27 insertions, 21 deletions
diff --git a/core/res/res/drawable/scrubber_progress_horizontal_material.xml b/core/res/res/drawable/scrubber_progress_horizontal_material.xml index f2ea30f..89a1787 100644 --- a/core/res/res/drawable/scrubber_progress_horizontal_material.xml +++ b/core/res/res/drawable/scrubber_progress_horizontal_material.xml @@ -14,29 +14,35 @@ limitations under the License. --> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_enabled="false"> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:id="@id/background"> <nine-patch android:src="@drawable/scrubber_track_mtrl_alpha" - android:tint="?attr/colorControlNormal" /> - </item> - <item> - <layer-list> - <item android:id="@id/background"> - <nine-patch android:src="@drawable/scrubber_track_mtrl_alpha" android:tint="?attr/colorControlNormal" /> - </item> - <item android:id="@id/secondaryProgress"> - <scale android:scaleWidth="100%"> + </item> + <item android:id="@id/secondaryProgress"> + <scale android:scaleWidth="100%"> + <selector> + <item android:state_enabled="false"> + <color android:color="@color/transparent" /> + </item> + <item> <nine-patch android:src="@drawable/scrubber_primary_mtrl_alpha" - android:tint="?attr/colorControlNormal" /> - </scale> - </item> - <item android:id="@id/progress"> - <scale android:scaleWidth="100%"> + android:tint="?attr/colorControlNormal" /> + </item> + </selector> + </scale> + </item> + <item android:id="@id/progress"> + <scale android:scaleWidth="100%"> + <selector> + <item android:state_enabled="false"> + <color android:color="@color/transparent" /> + </item> + <item> <nine-patch android:src="@drawable/scrubber_primary_mtrl_alpha" - android:tint="?attr/colorControlActivated" /> - </scale> - </item> - </layer-list> + android:tint="?attr/colorControlActivated" /> + </item> + </selector> + </scale> </item> -</selector> +</layer-list>
\ No newline at end of file |