aboutsummaryrefslogtreecommitdiff
path: root/res/menu
diff options
context:
space:
mode:
Diffstat (limited to 'res/menu')
-rw-r--r--res/menu/abstract_top_menu.xml6
-rw-r--r--res/menu/chat.xml4
-rw-r--r--res/menu/drawer_menu.xml2
-rw-r--r--res/menu/empty.xml2
-rw-r--r--res/menu/main.xml7
-rw-r--r--res/menu/nowplaying.xml11
-rw-r--r--res/menu/nowplaying_downloading.xml3
-rw-r--r--res/menu/nowplaying_offline.xml9
-rw-r--r--res/menu/search.xml4
-rw-r--r--res/menu/select_album.xml6
-rw-r--r--res/menu/select_album_list.xml2
-rw-r--r--res/menu/select_artist.xml8
-rw-r--r--res/menu/select_genres.xml2
-rw-r--r--res/menu/select_podcast_episode.xml3
-rw-r--r--res/menu/select_podcast_episode_offline.xml3
-rw-r--r--res/menu/select_podcasts.xml8
-rw-r--r--res/menu/select_song.xml26
-rw-r--r--res/menu/select_song_offline.xml18
18 files changed, 41 insertions, 83 deletions
diff --git a/res/menu/abstract_top_menu.xml b/res/menu/abstract_top_menu.xml
index 98f9884e..7d91bebd 100644
--- a/res/menu/abstract_top_menu.xml
+++ b/res/menu/abstract_top_menu.xml
@@ -3,23 +3,21 @@
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_refresh"
- android:icon="@drawable/action_refresh"
+ android:icon="?attr/refresh"
android:title="@string/menu.refresh"
compat:showAsAction="always|withText"/>
<item
android:id="@+id/menu_search"
- android:icon="@drawable/action_search"
+ android:icon="?attr/search"
android:title="@string/menu.search"
compat:showAsAction="always|withText"/>
<item
android:id="@+id/menu_settings"
- android:icon="@drawable/action_settings"
android:title="@string/menu.settings"/>
<item
android:id="@+id/menu_exit"
- android:icon="@drawable/action_exit"
android:title="@string/menu.exit"/>
</menu>
diff --git a/res/menu/chat.xml b/res/menu/chat.xml
index c8ea860a..5e39a5c7 100644
--- a/res/menu/chat.xml
+++ b/res/menu/chat.xml
@@ -3,17 +3,15 @@
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_refresh"
- android:icon="@drawable/action_refresh"
+ android:icon="?attr/refresh"
android:title="@string/menu.refresh"
compat:showAsAction="always|withText"/>
<item
android:id="@+id/menu_settings"
- android:icon="@drawable/action_settings"
android:title="@string/menu.settings"/>
<item
android:id="@+id/menu_exit"
- android:icon="@drawable/action_exit"
android:title="@string/menu.exit"/>
</menu> \ No newline at end of file
diff --git a/res/menu/drawer_menu.xml b/res/menu/drawer_menu.xml
index adba3c90..2b557738 100644
--- a/res/menu/drawer_menu.xml
+++ b/res/menu/drawer_menu.xml
@@ -4,11 +4,9 @@
<item
android:id="@+id/menu_settings"
- android:icon="@drawable/action_settings"
android:title="@string/menu.settings"/>
<item
android:id="@+id/menu_exit"
- android:icon="@drawable/action_exit"
android:title="@string/menu.exit"/>
</menu>
diff --git a/res/menu/empty.xml b/res/menu/empty.xml
index 979eefe4..9bb43bf7 100644
--- a/res/menu/empty.xml
+++ b/res/menu/empty.xml
@@ -3,7 +3,7 @@
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_refresh"
- android:icon="@drawable/action_refresh"
+ android:icon="?attr/refresh"
android:title="@string/menu.refresh"
compat:showAsAction="always|withText"/>
</menu>
diff --git a/res/menu/main.xml b/res/menu/main.xml
index 4b13b3c1..22809c47 100644
--- a/res/menu/main.xml
+++ b/res/menu/main.xml
@@ -3,19 +3,18 @@
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_search"
- android:icon="@drawable/action_search"
+ android:icon="?attr/search"
android:title="@string/menu.search"
compat:showAsAction="always|withText"/>
<item
android:id="@+id/menu_shuffle"
- android:icon="@drawable/action_shuffle"
+ android:icon="?attr/shuffle"
android:title="@string/menu.shuffle"
compat:showAsAction="always|withText"/>
<item
android:id="@+id/menu_about"
- android:icon="@drawable/action_help"
android:title="@string/menu.about"/>
<item
@@ -28,11 +27,9 @@
<item
android:id="@+id/menu_settings"
- android:icon="@drawable/action_settings"
android:title="@string/menu.settings"/>
<item
android:id="@+id/menu_exit"
- android:icon="@drawable/action_exit"
android:title="@string/menu.exit"/>
</menu>
diff --git a/res/menu/nowplaying.xml b/res/menu/nowplaying.xml
index 2fad22d2..3c9c5ba6 100644
--- a/res/menu/nowplaying.xml
+++ b/res/menu/nowplaying.xml
@@ -3,27 +3,25 @@
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_shuffle"
- android:icon="@drawable/action_shuffle"
+ android:icon="?attr/shuffle"
android:title="@string/download.menu_shuffle"
compat:showAsAction="ifRoom|withText"/>
<item
android:id="@+id/menu_remove_all"
- android:icon="@drawable/action_remove_all"
+ android:icon="?attr/remove"
android:title="@string/download.menu_remove_all"
compat:showAsAction="ifRoom|withText"/>
<item
android:id="@+id/menu_save_playlist"
- android:icon="@drawable/action_save"
+ android:icon="?attr/save"
android:title="@string/download.menu_save"
compat:showAsAction="ifRoom|withText"/>
<item
android:id="@+id/menu_screen_on_off"
- android:icon="@drawable/action_screen_on_off"
- android:title="@string/download.menu_screen_on"
- compat:showAsAction="ifRoom|withText"/>
+ android:title="@string/download.menu_screen_on"/>
<item
android:id="@+id/menu_toggle_timer"
@@ -35,6 +33,5 @@
<item
android:id="@+id/menu_exit"
- android:icon="@drawable/action_exit"
android:title="@string/menu.exit"/>
</menu>
diff --git a/res/menu/nowplaying_downloading.xml b/res/menu/nowplaying_downloading.xml
index 2c513964..50ab00f3 100644
--- a/res/menu/nowplaying_downloading.xml
+++ b/res/menu/nowplaying_downloading.xml
@@ -3,7 +3,7 @@
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_remove_all"
- android:icon="@drawable/action_remove_all"
+ android:icon="?attr/remove"
android:title="@string/download.menu_remove_all"
compat:showAsAction="always|withText"/>
@@ -13,6 +13,5 @@
<item
android:id="@+id/menu_exit"
- android:icon="@drawable/action_exit"
android:title="@string/menu.exit"/>
</menu>
diff --git a/res/menu/nowplaying_offline.xml b/res/menu/nowplaying_offline.xml
index 3faa8d97..41d1d5d1 100644
--- a/res/menu/nowplaying_offline.xml
+++ b/res/menu/nowplaying_offline.xml
@@ -4,21 +4,19 @@
<item
android:id="@+id/menu_shuffle"
- android:icon="@drawable/action_shuffle"
+ android:icon="?attr/shuffle"
android:title="@string/download.menu_shuffle"
compat:showAsAction="always|withText"/>
<item
android:id="@+id/menu_remove_all"
- android:icon="@drawable/action_remove_all"
+ android:icon="?attr/remove"
android:title="@string/download.menu_remove_all"
compat:showAsAction="always|withText"/>
<item
android:id="@+id/menu_screen_on_off"
- android:icon="@drawable/action_screen_on_off"
- android:title="@string/download.menu_screen_on"
- compat:showAsAction="ifRoom|withText"/>
+ android:title="@string/download.menu_screen_on"/>
<item
android:id="@+id/menu_toggle_timer"
@@ -26,6 +24,5 @@
<item
android:id="@+id/menu_exit"
- android:icon="@drawable/action_exit"
android:title="@string/menu.exit"/>
</menu>
diff --git a/res/menu/search.xml b/res/menu/search.xml
index 0f74e65c..fdadd748 100644
--- a/res/menu/search.xml
+++ b/res/menu/search.xml
@@ -3,18 +3,16 @@
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_search"
- android:icon="@drawable/action_search"
+ android:icon="?attr/search"
android:title="@string/menu.search"
compat:showAsAction="ifRoom|withText"/>
<item
android:id="@+id/menu_settings"
- android:icon="@drawable/ic_menu_settings"
android:title="@string/menu.settings"/>
<item
android:id="@+id/menu_exit"
- android:icon="@drawable/ic_menu_exit"
android:title="@string/menu.exit"/>
</menu>
diff --git a/res/menu/select_album.xml b/res/menu/select_album.xml
index 329c479c..469561f1 100644
--- a/res/menu/select_album.xml
+++ b/res/menu/select_album.xml
@@ -3,19 +3,19 @@
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_play_now"
- android:icon="@drawable/action_play_all"
+ android:icon="?media_button_start"
android:title="@string/menu.play"
compat:showAsAction="always|withText"/>
<item
android:id="@+id/menu_refresh"
- android:icon="@drawable/action_refresh"
+ android:icon="?attr/refresh"
android:title="@string/menu.refresh"
compat:showAsAction="always|withText"/>
<item
android:id="@+id/menu_shuffle"
- android:icon="@drawable/action_shuffle"
+ android:icon="?attr/shuffle"
android:title="@string/menu.shuffle"
compat:showAsAction="ifRoom|withText"/>
</menu>
diff --git a/res/menu/select_album_list.xml b/res/menu/select_album_list.xml
index 635a36bf..60b636e3 100644
--- a/res/menu/select_album_list.xml
+++ b/res/menu/select_album_list.xml
@@ -3,7 +3,7 @@
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_refresh"
- android:icon="@drawable/action_refresh"
+ android:icon="?attr/refresh"
android:title="@string/menu.refresh"
compat:showAsAction="always|withText"/>
</menu>
diff --git a/res/menu/select_artist.xml b/res/menu/select_artist.xml
index 1346343b..5e10dc80 100644
--- a/res/menu/select_artist.xml
+++ b/res/menu/select_artist.xml
@@ -3,29 +3,27 @@
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_refresh"
- android:icon="@drawable/action_refresh"
+ android:icon="?attr/refresh"
android:title="@string/menu.refresh"
compat:showAsAction="always|withText"/>
<item
android:id="@+id/menu_shuffle"
- android:icon="@drawable/action_shuffle"
+ android:icon="?attr/shuffle"
android:title="@string/menu.shuffle"
compat:showAsAction="always|withText"/>
<item
android:id="@+id/menu_search"
- android:icon="@drawable/action_search"
+ android:icon="?attr/search"
android:title="@string/menu.search"
compat:showAsAction="ifRoom|withText"/>
<item
android:id="@+id/menu_settings"
- android:icon="@drawable/action_settings"
android:title="@string/menu.settings"/>
<item
android:id="@+id/menu_exit"
- android:icon="@drawable/action_exit"
android:title="@string/menu.exit"/>
</menu>
diff --git a/res/menu/select_genres.xml b/res/menu/select_genres.xml
index ad2756d6..837b3534 100644
--- a/res/menu/select_genres.xml
+++ b/res/menu/select_genres.xml
@@ -3,7 +3,7 @@
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_refresh"
- android:icon="@drawable/action_refresh"
+ android:icon="?attr/refresh"
android:title="@string/menu.refresh"
compat:showAsAction="always|withText"/>
</menu> \ No newline at end of file
diff --git a/res/menu/select_podcast_episode.xml b/res/menu/select_podcast_episode.xml
index 7e79d0f7..8472325a 100644
--- a/res/menu/select_podcast_episode.xml
+++ b/res/menu/select_podcast_episode.xml
@@ -3,7 +3,7 @@
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_refresh"
- android:icon="@drawable/action_refresh"
+ android:icon="?attr/refresh"
android:title="@string/menu.refresh"
compat:showAsAction="always|withText"/>
@@ -13,6 +13,5 @@
<item
android:id="@+id/menu_delete"
- android:icon="@drawable/action_remove_all"
android:title="@string/common.delete"/>
</menu>
diff --git a/res/menu/select_podcast_episode_offline.xml b/res/menu/select_podcast_episode_offline.xml
index cb6d1a3b..4d464c1f 100644
--- a/res/menu/select_podcast_episode_offline.xml
+++ b/res/menu/select_podcast_episode_offline.xml
@@ -3,12 +3,11 @@
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_refresh"
- android:icon="@drawable/action_refresh"
+ android:icon="?attr/refresh"
android:title="@string/menu.refresh"
compat:showAsAction="always|withText"/>
<item
android:id="@+id/menu_delete"
- android:icon="@drawable/action_remove_all"
android:title="@string/common.delete"/>
</menu>
diff --git a/res/menu/select_podcasts.xml b/res/menu/select_podcasts.xml
index de6b83a7..d97ebe6c 100644
--- a/res/menu/select_podcasts.xml
+++ b/res/menu/select_podcasts.xml
@@ -3,33 +3,29 @@
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_refresh"
- android:icon="@drawable/action_refresh"
+ android:icon="?attr/refresh"
android:title="@string/menu.refresh"
compat:showAsAction="always|withText"/>
<item
android:id="@+id/menu_search"
- android:icon="@drawable/action_search"
+ android:icon="?attr/search"
android:title="@string/menu.search"
compat:showAsAction="always|withText"/>
<item
android:id="@+id/menu_add_podcast"
- android:icon="@drawable/action_exit"
android:title="@string/menu.add_podcast"/>
<item
android:id="@+id/menu_check"
- android:icon="@drawable/action_refresh"
android:title="@string/menu.check_podcasts"/>
<item
android:id="@+id/menu_settings"
- android:icon="@drawable/action_settings"
android:title="@string/menu.settings"/>
<item
android:id="@+id/menu_exit"
- android:icon="@drawable/action_exit"
android:title="@string/menu.exit"/>
</menu> \ No newline at end of file
diff --git a/res/menu/select_song.xml b/res/menu/select_song.xml
index 658e3ffe..d60dedac 100644
--- a/res/menu/select_song.xml
+++ b/res/menu/select_song.xml
@@ -3,45 +3,37 @@
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_play_now"
- android:icon="@drawable/action_play_all"
+ android:icon="?attr/media_button_start"
android:title="@string/menu.play"
compat:showAsAction="always|withText"/>
<item
android:id="@+id/menu_refresh"
- android:icon="@drawable/action_refresh"
+ android:icon="?attr/refresh"
android:title="@string/menu.refresh"
compat:showAsAction="always|withText"/>
<item
android:id="@+id/menu_shuffle"
- android:icon="@drawable/action_shuffle"
+ android:icon="?attr/shuffle"
android:title="@string/menu.shuffle"
compat:showAsAction="ifRoom|withText"/>
<item
android:id="@+id/menu_select"
- android:icon="@drawable/action_select"
- android:title="@string/menu.select"
- compat:showAsAction="ifRoom|withText"/>
+ android:title="@string/menu.select"/>
<item
android:id="@+id/menu_download"
- android:icon="@drawable/action_save"
- android:title="@string/common.download"
- compat:showAsAction="ifRoom|withText"/>
+ android:title="@string/common.download"/>
<item
android:id="@+id/menu_cache"
- android:icon="@drawable/action_save"
- android:title="@string/common.pin"
- compat:showAsAction="ifRoom|withText"/>
+ android:title="@string/common.pin"/>
<item
android:id="@+id/menu_delete"
- android:icon="@drawable/action_remove_all"
- android:title="@string/common.delete"
- compat:showAsAction="ifRoom|withText"/>
+ android:title="@string/common.delete"/>
<item
android:id="@+id/menu_add_playlist"
@@ -53,7 +45,5 @@
<item
android:id="@+id/menu_play_last"
- android:icon="@drawable/action_play_all"
- android:title="@string/menu.play_last"
- compat:showAsAction="ifRoom|withText"/>
+ android:title="@string/menu.play_last"/>
</menu>
diff --git a/res/menu/select_song_offline.xml b/res/menu/select_song_offline.xml
index 7588d9ad..88e9758d 100644
--- a/res/menu/select_song_offline.xml
+++ b/res/menu/select_song_offline.xml
@@ -3,37 +3,31 @@
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_play_now"
- android:icon="@drawable/action_play_all"
+ android:icon="?attr/media_button_start"
android:title="@string/menu.play"
compat:showAsAction="always|withText"/>
<item
android:id="@+id/menu_refresh"
- android:icon="@drawable/action_refresh"
+ android:icon="?attr/refresh"
android:title="@string/menu.refresh"
compat:showAsAction="always|withText"/>
<item
android:id="@+id/menu_shuffle"
- android:icon="@drawable/action_shuffle"
+ android:icon="?attr/shuffle"
android:title="@string/menu.shuffle"
compat:showAsAction="ifRoom|withText"/>
<item
android:id="@+id/menu_select"
- android:icon="@drawable/action_select"
- android:title="@string/menu.select"
- compat:showAsAction="ifRoom|withText"/>
+ android:title="@string/menu.select"/>
<item
android:id="@+id/menu_delete"
- android:icon="@drawable/action_remove_all"
- android:title="@string/common.delete"
- compat:showAsAction="ifRoom|withText"/>
+ android:title="@string/common.delete"/>
<item
android:id="@+id/menu_play_last"
- android:icon="@drawable/action_play_all"
- android:title="@string/menu.play_last"
- compat:showAsAction="ifRoom|withText"/>
+ android:title="@string/menu.play_last"/>
</menu>