From b68d19bcebec690f00308285e08281db2b84f763 Mon Sep 17 00:00:00 2001 From: olly Date: Mon, 2 Dec 2019 10:59:07 +0000 Subject: [PATCH] Add layer of indirection for drawables This allows easy overriding of the resources by app developers Issue: #6709 PiperOrigin-RevId: 283306121 --- RELEASENOTES.md | 3 +++ ...reen_enter.xml => exo_icon_fullscreen_enter.xml} | 0 ...screen_exit.xml => exo_icon_fullscreen_exit.xml} | 0 ...trols_repeat_all.xml => exo_icon_repeat_all.xml} | 0 ...trols_repeat_off.xml => exo_icon_repeat_off.xml} | 0 ...trols_repeat_one.xml => exo_icon_repeat_one.xml} | 0 ...ols_shuffle_off.xml => exo_icon_shuffle_off.xml} | 0 ...trols_shuffle_on.xml => exo_icon_shuffle_on.xml} | 0 ...on_small_icon.png => exo_icon_circular_play.png} | Bin ...reen_enter.png => exo_icon_fullscreen_enter.png} | Bin ...screen_exit.png => exo_icon_fullscreen_exit.png} | Bin ...trols_repeat_all.png => exo_icon_repeat_all.png} | Bin ...trols_repeat_off.png => exo_icon_repeat_off.png} | Bin ...trols_repeat_one.png => exo_icon_repeat_one.png} | Bin ...ols_shuffle_off.png => exo_icon_shuffle_off.png} | Bin ...trols_shuffle_on.png => exo_icon_shuffle_on.png} | Bin ...on_small_icon.png => exo_icon_circular_play.png} | Bin ...reen_enter.png => exo_icon_fullscreen_enter.png} | Bin ...screen_exit.png => exo_icon_fullscreen_exit.png} | Bin ...trols_repeat_all.png => exo_icon_repeat_all.png} | Bin ...trols_repeat_off.png => exo_icon_repeat_off.png} | Bin ...trols_repeat_one.png => exo_icon_repeat_one.png} | Bin ...ols_shuffle_off.png => exo_icon_shuffle_off.png} | Bin ...trols_shuffle_on.png => exo_icon_shuffle_on.png} | Bin ...on_small_icon.png => exo_icon_circular_play.png} | Bin ...reen_enter.png => exo_icon_fullscreen_enter.png} | Bin ...screen_exit.png => exo_icon_fullscreen_exit.png} | Bin ...trols_repeat_all.png => exo_icon_repeat_all.png} | Bin ...trols_repeat_off.png => exo_icon_repeat_off.png} | Bin ...trols_repeat_one.png => exo_icon_repeat_one.png} | Bin ...ols_shuffle_off.png => exo_icon_shuffle_off.png} | Bin ...trols_shuffle_on.png => exo_icon_shuffle_on.png} | Bin ...on_small_icon.png => exo_icon_circular_play.png} | Bin ...reen_enter.png => exo_icon_fullscreen_enter.png} | Bin ...screen_exit.png => exo_icon_fullscreen_exit.png} | Bin ...trols_repeat_all.png => exo_icon_repeat_all.png} | Bin ...trols_repeat_off.png => exo_icon_repeat_off.png} | Bin ...trols_repeat_one.png => exo_icon_repeat_one.png} | Bin ...ols_shuffle_off.png => exo_icon_shuffle_off.png} | Bin ...trols_shuffle_on.png => exo_icon_shuffle_on.png} | Bin ...on_small_icon.png => exo_icon_circular_play.png} | Bin ...reen_enter.png => exo_icon_fullscreen_enter.png} | Bin ...screen_exit.png => exo_icon_fullscreen_exit.png} | Bin ...trols_repeat_all.png => exo_icon_repeat_all.png} | Bin ...trols_repeat_off.png => exo_icon_repeat_off.png} | Bin ...trols_repeat_one.png => exo_icon_repeat_one.png} | Bin ...ols_shuffle_off.png => exo_icon_shuffle_off.png} | Bin ...trols_shuffle_on.png => exo_icon_shuffle_on.png} | Bin ...on_small_icon.png => exo_icon_circular_play.png} | Bin library/ui/src/main/res/values/drawables.xml | 9 +++++++++ library/ui/src/main/res/values/styles.xml | 2 +- 51 files changed, 13 insertions(+), 1 deletion(-) rename library/ui/src/main/res/drawable-anydpi-v21/{exo_controls_fullscreen_enter.xml => exo_icon_fullscreen_enter.xml} (100%) rename library/ui/src/main/res/drawable-anydpi-v21/{exo_controls_fullscreen_exit.xml => exo_icon_fullscreen_exit.xml} (100%) rename library/ui/src/main/res/drawable-anydpi-v21/{exo_controls_repeat_all.xml => exo_icon_repeat_all.xml} (100%) rename library/ui/src/main/res/drawable-anydpi-v21/{exo_controls_repeat_off.xml => exo_icon_repeat_off.xml} (100%) rename library/ui/src/main/res/drawable-anydpi-v21/{exo_controls_repeat_one.xml => exo_icon_repeat_one.xml} (100%) rename library/ui/src/main/res/drawable-anydpi-v21/{exo_controls_shuffle_off.xml => exo_icon_shuffle_off.xml} (100%) rename library/ui/src/main/res/drawable-anydpi-v21/{exo_controls_shuffle_on.xml => exo_icon_shuffle_on.xml} (100%) rename library/ui/src/main/res/drawable-hdpi/{exo_notification_small_icon.png => exo_icon_circular_play.png} (100%) rename library/ui/src/main/res/drawable-hdpi/{exo_controls_fullscreen_enter.png => exo_icon_fullscreen_enter.png} (100%) rename library/ui/src/main/res/drawable-hdpi/{exo_controls_fullscreen_exit.png => exo_icon_fullscreen_exit.png} (100%) rename library/ui/src/main/res/drawable-hdpi/{exo_controls_repeat_all.png => exo_icon_repeat_all.png} (100%) rename library/ui/src/main/res/drawable-hdpi/{exo_controls_repeat_off.png => exo_icon_repeat_off.png} (100%) rename library/ui/src/main/res/drawable-hdpi/{exo_controls_repeat_one.png => exo_icon_repeat_one.png} (100%) rename library/ui/src/main/res/drawable-hdpi/{exo_controls_shuffle_off.png => exo_icon_shuffle_off.png} (100%) rename library/ui/src/main/res/drawable-hdpi/{exo_controls_shuffle_on.png => exo_icon_shuffle_on.png} (100%) rename library/ui/src/main/res/drawable-ldpi/{exo_notification_small_icon.png => exo_icon_circular_play.png} (100%) rename library/ui/src/main/res/drawable-ldpi/{exo_controls_fullscreen_enter.png => exo_icon_fullscreen_enter.png} (100%) rename library/ui/src/main/res/drawable-ldpi/{exo_controls_fullscreen_exit.png => exo_icon_fullscreen_exit.png} (100%) rename library/ui/src/main/res/drawable-ldpi/{exo_controls_repeat_all.png => exo_icon_repeat_all.png} (100%) rename library/ui/src/main/res/drawable-ldpi/{exo_controls_repeat_off.png => exo_icon_repeat_off.png} (100%) rename library/ui/src/main/res/drawable-ldpi/{exo_controls_repeat_one.png => exo_icon_repeat_one.png} (100%) rename library/ui/src/main/res/drawable-ldpi/{exo_controls_shuffle_off.png => exo_icon_shuffle_off.png} (100%) rename library/ui/src/main/res/drawable-ldpi/{exo_controls_shuffle_on.png => exo_icon_shuffle_on.png} (100%) rename library/ui/src/main/res/drawable-mdpi/{exo_notification_small_icon.png => exo_icon_circular_play.png} (100%) rename library/ui/src/main/res/drawable-mdpi/{exo_controls_fullscreen_enter.png => exo_icon_fullscreen_enter.png} (100%) rename library/ui/src/main/res/drawable-mdpi/{exo_controls_fullscreen_exit.png => exo_icon_fullscreen_exit.png} (100%) rename library/ui/src/main/res/drawable-mdpi/{exo_controls_repeat_all.png => exo_icon_repeat_all.png} (100%) rename library/ui/src/main/res/drawable-mdpi/{exo_controls_repeat_off.png => exo_icon_repeat_off.png} (100%) rename library/ui/src/main/res/drawable-mdpi/{exo_controls_repeat_one.png => exo_icon_repeat_one.png} (100%) rename library/ui/src/main/res/drawable-mdpi/{exo_controls_shuffle_off.png => exo_icon_shuffle_off.png} (100%) rename library/ui/src/main/res/drawable-mdpi/{exo_controls_shuffle_on.png => exo_icon_shuffle_on.png} (100%) rename library/ui/src/main/res/drawable-xhdpi/{exo_notification_small_icon.png => exo_icon_circular_play.png} (100%) rename library/ui/src/main/res/drawable-xhdpi/{exo_controls_fullscreen_enter.png => exo_icon_fullscreen_enter.png} (100%) rename library/ui/src/main/res/drawable-xhdpi/{exo_controls_fullscreen_exit.png => exo_icon_fullscreen_exit.png} (100%) rename library/ui/src/main/res/drawable-xhdpi/{exo_controls_repeat_all.png => exo_icon_repeat_all.png} (100%) rename library/ui/src/main/res/drawable-xhdpi/{exo_controls_repeat_off.png => exo_icon_repeat_off.png} (100%) rename library/ui/src/main/res/drawable-xhdpi/{exo_controls_repeat_one.png => exo_icon_repeat_one.png} (100%) rename library/ui/src/main/res/drawable-xhdpi/{exo_controls_shuffle_off.png => exo_icon_shuffle_off.png} (100%) rename library/ui/src/main/res/drawable-xhdpi/{exo_controls_shuffle_on.png => exo_icon_shuffle_on.png} (100%) rename library/ui/src/main/res/drawable-xxhdpi/{exo_notification_small_icon.png => exo_icon_circular_play.png} (100%) rename library/ui/src/main/res/drawable-xxhdpi/{exo_controls_fullscreen_enter.png => exo_icon_fullscreen_enter.png} (100%) rename library/ui/src/main/res/drawable-xxhdpi/{exo_controls_fullscreen_exit.png => exo_icon_fullscreen_exit.png} (100%) rename library/ui/src/main/res/drawable-xxhdpi/{exo_controls_repeat_all.png => exo_icon_repeat_all.png} (100%) rename library/ui/src/main/res/drawable-xxhdpi/{exo_controls_repeat_off.png => exo_icon_repeat_off.png} (100%) rename library/ui/src/main/res/drawable-xxhdpi/{exo_controls_repeat_one.png => exo_icon_repeat_one.png} (100%) rename library/ui/src/main/res/drawable-xxhdpi/{exo_controls_shuffle_off.png => exo_icon_shuffle_off.png} (100%) rename library/ui/src/main/res/drawable-xxhdpi/{exo_controls_shuffle_on.png => exo_icon_shuffle_on.png} (100%) rename library/ui/src/main/res/drawable-xxxhdpi/{exo_notification_small_icon.png => exo_icon_circular_play.png} (100%) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 57ae217d05..9fcd586452 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -102,6 +102,9 @@ * Make showing and hiding player controls accessible to TalkBack in `PlayerView`. * Rename `spherical_view` surface type to `spherical_gl_surface_view`. + * Make it easier to override the shuffle, repeat, fullscreen, VR and small + notification icon assets + ([#6709](https://github.com/google/ExoPlayer/issues/6709)). * Analytics: * Remove `AnalyticsCollector.Factory`. Instances should be created directly, and the `Player` should be set by calling `AnalyticsCollector.setPlayer`. diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_fullscreen_enter.xml b/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_fullscreen_enter.xml similarity index 100% rename from library/ui/src/main/res/drawable-anydpi-v21/exo_controls_fullscreen_enter.xml rename to library/ui/src/main/res/drawable-anydpi-v21/exo_icon_fullscreen_enter.xml diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_fullscreen_exit.xml b/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_fullscreen_exit.xml similarity index 100% rename from library/ui/src/main/res/drawable-anydpi-v21/exo_controls_fullscreen_exit.xml rename to library/ui/src/main/res/drawable-anydpi-v21/exo_icon_fullscreen_exit.xml diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_repeat_all.xml b/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_repeat_all.xml similarity index 100% rename from library/ui/src/main/res/drawable-anydpi-v21/exo_controls_repeat_all.xml rename to library/ui/src/main/res/drawable-anydpi-v21/exo_icon_repeat_all.xml diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_repeat_off.xml b/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_repeat_off.xml similarity index 100% rename from library/ui/src/main/res/drawable-anydpi-v21/exo_controls_repeat_off.xml rename to library/ui/src/main/res/drawable-anydpi-v21/exo_icon_repeat_off.xml diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_repeat_one.xml b/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_repeat_one.xml similarity index 100% rename from library/ui/src/main/res/drawable-anydpi-v21/exo_controls_repeat_one.xml rename to library/ui/src/main/res/drawable-anydpi-v21/exo_icon_repeat_one.xml diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_shuffle_off.xml b/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_shuffle_off.xml similarity index 100% rename from library/ui/src/main/res/drawable-anydpi-v21/exo_controls_shuffle_off.xml rename to library/ui/src/main/res/drawable-anydpi-v21/exo_icon_shuffle_off.xml diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_shuffle_on.xml b/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_shuffle_on.xml similarity index 100% rename from library/ui/src/main/res/drawable-anydpi-v21/exo_controls_shuffle_on.xml rename to library/ui/src/main/res/drawable-anydpi-v21/exo_icon_shuffle_on.xml diff --git a/library/ui/src/main/res/drawable-hdpi/exo_notification_small_icon.png b/library/ui/src/main/res/drawable-hdpi/exo_icon_circular_play.png similarity index 100% rename from library/ui/src/main/res/drawable-hdpi/exo_notification_small_icon.png rename to library/ui/src/main/res/drawable-hdpi/exo_icon_circular_play.png diff --git a/library/ui/src/main/res/drawable-hdpi/exo_controls_fullscreen_enter.png b/library/ui/src/main/res/drawable-hdpi/exo_icon_fullscreen_enter.png similarity index 100% rename from library/ui/src/main/res/drawable-hdpi/exo_controls_fullscreen_enter.png rename to library/ui/src/main/res/drawable-hdpi/exo_icon_fullscreen_enter.png diff --git a/library/ui/src/main/res/drawable-hdpi/exo_controls_fullscreen_exit.png b/library/ui/src/main/res/drawable-hdpi/exo_icon_fullscreen_exit.png similarity index 100% rename from library/ui/src/main/res/drawable-hdpi/exo_controls_fullscreen_exit.png rename to library/ui/src/main/res/drawable-hdpi/exo_icon_fullscreen_exit.png diff --git a/library/ui/src/main/res/drawable-hdpi/exo_controls_repeat_all.png b/library/ui/src/main/res/drawable-hdpi/exo_icon_repeat_all.png similarity index 100% rename from library/ui/src/main/res/drawable-hdpi/exo_controls_repeat_all.png rename to library/ui/src/main/res/drawable-hdpi/exo_icon_repeat_all.png diff --git a/library/ui/src/main/res/drawable-hdpi/exo_controls_repeat_off.png b/library/ui/src/main/res/drawable-hdpi/exo_icon_repeat_off.png similarity index 100% rename from library/ui/src/main/res/drawable-hdpi/exo_controls_repeat_off.png rename to library/ui/src/main/res/drawable-hdpi/exo_icon_repeat_off.png diff --git a/library/ui/src/main/res/drawable-hdpi/exo_controls_repeat_one.png b/library/ui/src/main/res/drawable-hdpi/exo_icon_repeat_one.png similarity index 100% rename from library/ui/src/main/res/drawable-hdpi/exo_controls_repeat_one.png rename to library/ui/src/main/res/drawable-hdpi/exo_icon_repeat_one.png diff --git a/library/ui/src/main/res/drawable-hdpi/exo_controls_shuffle_off.png b/library/ui/src/main/res/drawable-hdpi/exo_icon_shuffle_off.png similarity index 100% rename from library/ui/src/main/res/drawable-hdpi/exo_controls_shuffle_off.png rename to library/ui/src/main/res/drawable-hdpi/exo_icon_shuffle_off.png diff --git a/library/ui/src/main/res/drawable-hdpi/exo_controls_shuffle_on.png b/library/ui/src/main/res/drawable-hdpi/exo_icon_shuffle_on.png similarity index 100% rename from library/ui/src/main/res/drawable-hdpi/exo_controls_shuffle_on.png rename to library/ui/src/main/res/drawable-hdpi/exo_icon_shuffle_on.png diff --git a/library/ui/src/main/res/drawable-ldpi/exo_notification_small_icon.png b/library/ui/src/main/res/drawable-ldpi/exo_icon_circular_play.png similarity index 100% rename from library/ui/src/main/res/drawable-ldpi/exo_notification_small_icon.png rename to library/ui/src/main/res/drawable-ldpi/exo_icon_circular_play.png diff --git a/library/ui/src/main/res/drawable-ldpi/exo_controls_fullscreen_enter.png b/library/ui/src/main/res/drawable-ldpi/exo_icon_fullscreen_enter.png similarity index 100% rename from library/ui/src/main/res/drawable-ldpi/exo_controls_fullscreen_enter.png rename to library/ui/src/main/res/drawable-ldpi/exo_icon_fullscreen_enter.png diff --git a/library/ui/src/main/res/drawable-ldpi/exo_controls_fullscreen_exit.png b/library/ui/src/main/res/drawable-ldpi/exo_icon_fullscreen_exit.png similarity index 100% rename from library/ui/src/main/res/drawable-ldpi/exo_controls_fullscreen_exit.png rename to library/ui/src/main/res/drawable-ldpi/exo_icon_fullscreen_exit.png diff --git a/library/ui/src/main/res/drawable-ldpi/exo_controls_repeat_all.png b/library/ui/src/main/res/drawable-ldpi/exo_icon_repeat_all.png similarity index 100% rename from library/ui/src/main/res/drawable-ldpi/exo_controls_repeat_all.png rename to library/ui/src/main/res/drawable-ldpi/exo_icon_repeat_all.png diff --git a/library/ui/src/main/res/drawable-ldpi/exo_controls_repeat_off.png b/library/ui/src/main/res/drawable-ldpi/exo_icon_repeat_off.png similarity index 100% rename from library/ui/src/main/res/drawable-ldpi/exo_controls_repeat_off.png rename to library/ui/src/main/res/drawable-ldpi/exo_icon_repeat_off.png diff --git a/library/ui/src/main/res/drawable-ldpi/exo_controls_repeat_one.png b/library/ui/src/main/res/drawable-ldpi/exo_icon_repeat_one.png similarity index 100% rename from library/ui/src/main/res/drawable-ldpi/exo_controls_repeat_one.png rename to library/ui/src/main/res/drawable-ldpi/exo_icon_repeat_one.png diff --git a/library/ui/src/main/res/drawable-ldpi/exo_controls_shuffle_off.png b/library/ui/src/main/res/drawable-ldpi/exo_icon_shuffle_off.png similarity index 100% rename from library/ui/src/main/res/drawable-ldpi/exo_controls_shuffle_off.png rename to library/ui/src/main/res/drawable-ldpi/exo_icon_shuffle_off.png diff --git a/library/ui/src/main/res/drawable-ldpi/exo_controls_shuffle_on.png b/library/ui/src/main/res/drawable-ldpi/exo_icon_shuffle_on.png similarity index 100% rename from library/ui/src/main/res/drawable-ldpi/exo_controls_shuffle_on.png rename to library/ui/src/main/res/drawable-ldpi/exo_icon_shuffle_on.png diff --git a/library/ui/src/main/res/drawable-mdpi/exo_notification_small_icon.png b/library/ui/src/main/res/drawable-mdpi/exo_icon_circular_play.png similarity index 100% rename from library/ui/src/main/res/drawable-mdpi/exo_notification_small_icon.png rename to library/ui/src/main/res/drawable-mdpi/exo_icon_circular_play.png diff --git a/library/ui/src/main/res/drawable-mdpi/exo_controls_fullscreen_enter.png b/library/ui/src/main/res/drawable-mdpi/exo_icon_fullscreen_enter.png similarity index 100% rename from library/ui/src/main/res/drawable-mdpi/exo_controls_fullscreen_enter.png rename to library/ui/src/main/res/drawable-mdpi/exo_icon_fullscreen_enter.png diff --git a/library/ui/src/main/res/drawable-mdpi/exo_controls_fullscreen_exit.png b/library/ui/src/main/res/drawable-mdpi/exo_icon_fullscreen_exit.png similarity index 100% rename from library/ui/src/main/res/drawable-mdpi/exo_controls_fullscreen_exit.png rename to library/ui/src/main/res/drawable-mdpi/exo_icon_fullscreen_exit.png diff --git a/library/ui/src/main/res/drawable-mdpi/exo_controls_repeat_all.png b/library/ui/src/main/res/drawable-mdpi/exo_icon_repeat_all.png similarity index 100% rename from library/ui/src/main/res/drawable-mdpi/exo_controls_repeat_all.png rename to library/ui/src/main/res/drawable-mdpi/exo_icon_repeat_all.png diff --git a/library/ui/src/main/res/drawable-mdpi/exo_controls_repeat_off.png b/library/ui/src/main/res/drawable-mdpi/exo_icon_repeat_off.png similarity index 100% rename from library/ui/src/main/res/drawable-mdpi/exo_controls_repeat_off.png rename to library/ui/src/main/res/drawable-mdpi/exo_icon_repeat_off.png diff --git a/library/ui/src/main/res/drawable-mdpi/exo_controls_repeat_one.png b/library/ui/src/main/res/drawable-mdpi/exo_icon_repeat_one.png similarity index 100% rename from library/ui/src/main/res/drawable-mdpi/exo_controls_repeat_one.png rename to library/ui/src/main/res/drawable-mdpi/exo_icon_repeat_one.png diff --git a/library/ui/src/main/res/drawable-mdpi/exo_controls_shuffle_off.png b/library/ui/src/main/res/drawable-mdpi/exo_icon_shuffle_off.png similarity index 100% rename from library/ui/src/main/res/drawable-mdpi/exo_controls_shuffle_off.png rename to library/ui/src/main/res/drawable-mdpi/exo_icon_shuffle_off.png diff --git a/library/ui/src/main/res/drawable-mdpi/exo_controls_shuffle_on.png b/library/ui/src/main/res/drawable-mdpi/exo_icon_shuffle_on.png similarity index 100% rename from library/ui/src/main/res/drawable-mdpi/exo_controls_shuffle_on.png rename to library/ui/src/main/res/drawable-mdpi/exo_icon_shuffle_on.png diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_notification_small_icon.png b/library/ui/src/main/res/drawable-xhdpi/exo_icon_circular_play.png similarity index 100% rename from library/ui/src/main/res/drawable-xhdpi/exo_notification_small_icon.png rename to library/ui/src/main/res/drawable-xhdpi/exo_icon_circular_play.png diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_controls_fullscreen_enter.png b/library/ui/src/main/res/drawable-xhdpi/exo_icon_fullscreen_enter.png similarity index 100% rename from library/ui/src/main/res/drawable-xhdpi/exo_controls_fullscreen_enter.png rename to library/ui/src/main/res/drawable-xhdpi/exo_icon_fullscreen_enter.png diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_controls_fullscreen_exit.png b/library/ui/src/main/res/drawable-xhdpi/exo_icon_fullscreen_exit.png similarity index 100% rename from library/ui/src/main/res/drawable-xhdpi/exo_controls_fullscreen_exit.png rename to library/ui/src/main/res/drawable-xhdpi/exo_icon_fullscreen_exit.png diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_controls_repeat_all.png b/library/ui/src/main/res/drawable-xhdpi/exo_icon_repeat_all.png similarity index 100% rename from library/ui/src/main/res/drawable-xhdpi/exo_controls_repeat_all.png rename to library/ui/src/main/res/drawable-xhdpi/exo_icon_repeat_all.png diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_controls_repeat_off.png b/library/ui/src/main/res/drawable-xhdpi/exo_icon_repeat_off.png similarity index 100% rename from library/ui/src/main/res/drawable-xhdpi/exo_controls_repeat_off.png rename to library/ui/src/main/res/drawable-xhdpi/exo_icon_repeat_off.png diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_controls_repeat_one.png b/library/ui/src/main/res/drawable-xhdpi/exo_icon_repeat_one.png similarity index 100% rename from library/ui/src/main/res/drawable-xhdpi/exo_controls_repeat_one.png rename to library/ui/src/main/res/drawable-xhdpi/exo_icon_repeat_one.png diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_controls_shuffle_off.png b/library/ui/src/main/res/drawable-xhdpi/exo_icon_shuffle_off.png similarity index 100% rename from library/ui/src/main/res/drawable-xhdpi/exo_controls_shuffle_off.png rename to library/ui/src/main/res/drawable-xhdpi/exo_icon_shuffle_off.png diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_controls_shuffle_on.png b/library/ui/src/main/res/drawable-xhdpi/exo_icon_shuffle_on.png similarity index 100% rename from library/ui/src/main/res/drawable-xhdpi/exo_controls_shuffle_on.png rename to library/ui/src/main/res/drawable-xhdpi/exo_icon_shuffle_on.png diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_notification_small_icon.png b/library/ui/src/main/res/drawable-xxhdpi/exo_icon_circular_play.png similarity index 100% rename from library/ui/src/main/res/drawable-xxhdpi/exo_notification_small_icon.png rename to library/ui/src/main/res/drawable-xxhdpi/exo_icon_circular_play.png diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_controls_fullscreen_enter.png b/library/ui/src/main/res/drawable-xxhdpi/exo_icon_fullscreen_enter.png similarity index 100% rename from library/ui/src/main/res/drawable-xxhdpi/exo_controls_fullscreen_enter.png rename to library/ui/src/main/res/drawable-xxhdpi/exo_icon_fullscreen_enter.png diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_controls_fullscreen_exit.png b/library/ui/src/main/res/drawable-xxhdpi/exo_icon_fullscreen_exit.png similarity index 100% rename from library/ui/src/main/res/drawable-xxhdpi/exo_controls_fullscreen_exit.png rename to library/ui/src/main/res/drawable-xxhdpi/exo_icon_fullscreen_exit.png diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_controls_repeat_all.png b/library/ui/src/main/res/drawable-xxhdpi/exo_icon_repeat_all.png similarity index 100% rename from library/ui/src/main/res/drawable-xxhdpi/exo_controls_repeat_all.png rename to library/ui/src/main/res/drawable-xxhdpi/exo_icon_repeat_all.png diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_controls_repeat_off.png b/library/ui/src/main/res/drawable-xxhdpi/exo_icon_repeat_off.png similarity index 100% rename from library/ui/src/main/res/drawable-xxhdpi/exo_controls_repeat_off.png rename to library/ui/src/main/res/drawable-xxhdpi/exo_icon_repeat_off.png diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_controls_repeat_one.png b/library/ui/src/main/res/drawable-xxhdpi/exo_icon_repeat_one.png similarity index 100% rename from library/ui/src/main/res/drawable-xxhdpi/exo_controls_repeat_one.png rename to library/ui/src/main/res/drawable-xxhdpi/exo_icon_repeat_one.png diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_controls_shuffle_off.png b/library/ui/src/main/res/drawable-xxhdpi/exo_icon_shuffle_off.png similarity index 100% rename from library/ui/src/main/res/drawable-xxhdpi/exo_controls_shuffle_off.png rename to library/ui/src/main/res/drawable-xxhdpi/exo_icon_shuffle_off.png diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_controls_shuffle_on.png b/library/ui/src/main/res/drawable-xxhdpi/exo_icon_shuffle_on.png similarity index 100% rename from library/ui/src/main/res/drawable-xxhdpi/exo_controls_shuffle_on.png rename to library/ui/src/main/res/drawable-xxhdpi/exo_icon_shuffle_on.png diff --git a/library/ui/src/main/res/drawable-xxxhdpi/exo_notification_small_icon.png b/library/ui/src/main/res/drawable-xxxhdpi/exo_icon_circular_play.png similarity index 100% rename from library/ui/src/main/res/drawable-xxxhdpi/exo_notification_small_icon.png rename to library/ui/src/main/res/drawable-xxxhdpi/exo_icon_circular_play.png diff --git a/library/ui/src/main/res/values/drawables.xml b/library/ui/src/main/res/values/drawables.xml index 3cd9168726..84c037a8b7 100644 --- a/library/ui/src/main/res/values/drawables.xml +++ b/library/ui/src/main/res/values/drawables.xml @@ -20,6 +20,14 @@ @drawable/exo_icon_previous @drawable/exo_icon_fastforward @drawable/exo_icon_rewind + @drawable/exo_icon_repeat_all + @drawable/exo_icon_repeat_off + @drawable/exo_icon_repeat_one + @drawable/exo_icon_shuffle_off + @drawable/exo_icon_shuffle_on + @drawable/exo_icon_fullscreen_enter + @drawable/exo_icon_fullscreen_exit + @drawable/exo_icon_vr @drawable/exo_icon_play @drawable/exo_icon_pause @drawable/exo_icon_next @@ -27,4 +35,5 @@ @drawable/exo_icon_fastforward @drawable/exo_icon_rewind @drawable/exo_icon_stop + @drawable/exo_icon_circular_play diff --git a/library/ui/src/main/res/values/styles.xml b/library/ui/src/main/res/values/styles.xml index c458a3ea99..c271a0af6d 100644 --- a/library/ui/src/main/res/values/styles.xml +++ b/library/ui/src/main/res/values/styles.xml @@ -52,7 +52,7 @@