diff options
Diffstat (limited to 'res/drawable')
| -rw-r--r-- | res/drawable/play_controls_time_indicator.xml | 2 | ||||
| -rw-r--r-- | res/drawable/playback_progress_bar.xml (renamed from res/drawable/setup_item_background.xml) | 27 | ||||
| -rw-r--r-- | res/drawable/priority_settings_action_item_selected.xml | 12 |
3 files changed, 20 insertions, 21 deletions
diff --git a/res/drawable/play_controls_time_indicator.xml b/res/drawable/play_controls_time_indicator.xml index 16acb107..85fee1fb 100644 --- a/res/drawable/play_controls_time_indicator.xml +++ b/res/drawable/play_controls_time_indicator.xml @@ -17,7 +17,5 @@ <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval" > - <size android:width="@dimen/play_controls_time_indicator_width" - android:height="@dimen/play_controls_time_indicator_height" /> <solid android:color="@color/play_controls_progress_time_indicator_color" /> </shape> diff --git a/res/drawable/setup_item_background.xml b/res/drawable/playback_progress_bar.xml index fb3899aa..2a70ec82 100644 --- a/res/drawable/setup_item_background.xml +++ b/res/drawable/playback_progress_bar.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - ~ Copyright (C) 2015 The Android Open Source Project + ~ Copyright (C) 2017 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. @@ -14,15 +14,20 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - -<ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:enterFadeDuration="@android:integer/config_shortAnimTime" - android:exitFadeDuration="@android:integer/config_shortAnimTime" - android:color="?android:attr/colorControlHighlight"> - <item android:id="@android:id/mask"> - <shape android:shape="rectangle" > - <solid android:color="@android:color/white" /> - <corners android:radius="2dp" /> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:id="@android:id/background"> + <shape> + <solid android:color="@color/play_controls_progress_bar_background" /> </shape> </item> -</ripple> + <item android:id="@android:id/secondaryProgress"> + <shape> + <solid android:color="@color/play_controls_progress_bar_buffered" /> + </shape> + </item> + <item android:id="@android:id/progress"> + <shape> + <solid android:color="@color/play_controls_progress_bar_watched" /> + </shape> + </item> +</layer-list>
\ No newline at end of file diff --git a/res/drawable/priority_settings_action_item_selected.xml b/res/drawable/priority_settings_action_item_selected.xml index a1ab18ae..3e017313 100644 --- a/res/drawable/priority_settings_action_item_selected.xml +++ b/res/drawable/priority_settings_action_item_selected.xml @@ -15,12 +15,8 @@ ~ limitations under the License. --> -<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:left="24dp" android:right="24dp"> - <shape> - <solid android:color="#EEEEEE"/> - <corners android:radius="2dp" /> - </shape> - </item> -</layer-list> +<shape xmlns:android="http://schemas.android.com/apk/res/android"> + <solid android:color="#EEEEEE"/> + <corners android:radius="2dp" /> +</shape> |