From 3e2a0091eb6293d32d6f75d65a0431193b11ace9 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Fri, 8 Nov 2013 20:26:22 -0800 Subject: Update all icons that I could find replacements for --- res/drawable-hdpi/action_browse.png | Bin 1673 -> 0 bytes res/drawable-hdpi/action_compass.png | Bin 2069 -> 0 bytes res/drawable-hdpi/action_exit.png | Bin 923 -> 0 bytes res/drawable-hdpi/action_help.png | Bin 1197 -> 0 bytes res/drawable-hdpi/action_moreoverflow.png | Bin 126 -> 0 bytes res/drawable-hdpi/action_offline.png | Bin 1558 -> 0 bytes res/drawable-hdpi/action_play_all.png | Bin 1359 -> 0 bytes res/drawable-hdpi/action_refresh.png | Bin 1820 -> 0 bytes res/drawable-hdpi/action_remove_all.png | Bin 1201 -> 0 bytes res/drawable-hdpi/action_save.png | Bin 1044 -> 0 bytes res/drawable-hdpi/action_screen_on_off.png | Bin 1525 -> 0 bytes res/drawable-hdpi/action_search.png | Bin 1592 -> 0 bytes res/drawable-hdpi/action_select.png | Bin 1158 -> 0 bytes res/drawable-hdpi/action_settings.png | Bin 1649 -> 0 bytes res/drawable-hdpi/action_share.png | Bin 1823 -> 0 bytes res/drawable-hdpi/action_shuffle.png | Bin 1386 -> 0 bytes res/drawable-hdpi/ic_menu_chat_dark.png | Bin 1401 -> 421 bytes res/drawable-hdpi/ic_menu_chat_light.png | Bin 1374 -> 453 bytes res/drawable-hdpi/ic_menu_chat_send_dark.png | Bin 1668 -> 602 bytes res/drawable-hdpi/ic_menu_chat_send_light.png | Bin 1691 -> 677 bytes res/drawable-hdpi/ic_menu_exit.png | Bin 5689 -> 0 bytes res/drawable-hdpi/ic_menu_help.png | Bin 5250 -> 0 bytes res/drawable-hdpi/ic_menu_settings.png | Bin 5455 -> 0 bytes res/drawable-hdpi/ic_menu_shuffle.png | Bin 1386 -> 0 bytes res/drawable-hdpi/ic_menu_shuffle_dark.png | Bin 0 -> 985 bytes res/drawable-hdpi/ic_menu_shuffle_light.png | Bin 0 -> 1132 bytes res/drawable-hdpi/main_offline.png | Bin 1405 -> 0 bytes res/drawable-hdpi/main_offline_light.png | Bin 564 -> 746 bytes res/drawable-hdpi/volume.png | Bin 1659 -> 0 bytes res/drawable-mdpi/ic_menu_shuffle_dark.png | Bin 0 -> 653 bytes res/drawable-mdpi/ic_menu_shuffle_light.png | Bin 0 -> 725 bytes res/drawable-xhdpi/ic_menu_shuffle_dark.png | Bin 0 -> 1400 bytes res/drawable-xhdpi/ic_menu_shuffle_light.png | Bin 0 -> 1637 bytes res/drawable-xxhdpi/ic_menu_shuffle_dark.png | Bin 0 -> 2268 bytes res/drawable-xxhdpi/ic_menu_shuffle_light.png | Bin 0 -> 2529 bytes res/layout/jukebox_volume.xml | 2 +- res/menu/abstract_top_menu.xml | 6 ++---- res/menu/chat.xml | 4 +--- res/menu/drawer_menu.xml | 2 -- res/menu/empty.xml | 2 +- res/menu/main.xml | 7 ++----- res/menu/nowplaying.xml | 11 ++++------- res/menu/nowplaying_downloading.xml | 3 +-- res/menu/nowplaying_offline.xml | 9 +++------ res/menu/search.xml | 4 +--- res/menu/select_album.xml | 6 +++--- res/menu/select_album_list.xml | 2 +- res/menu/select_artist.xml | 8 +++----- res/menu/select_genres.xml | 2 +- res/menu/select_podcast_episode.xml | 3 +-- res/menu/select_podcast_episode_offline.xml | 3 +-- res/menu/select_podcasts.xml | 8 ++------ res/menu/select_song.xml | 26 ++++++++------------------ res/menu/select_song_offline.xml | 18 ++++++------------ res/values/attrs.xml | 10 ++++++++-- res/values/themes.xml | 24 +++++++++++++++++++++--- 56 files changed, 71 insertions(+), 89 deletions(-) delete mode 100644 res/drawable-hdpi/action_browse.png delete mode 100644 res/drawable-hdpi/action_compass.png delete mode 100644 res/drawable-hdpi/action_exit.png delete mode 100644 res/drawable-hdpi/action_help.png delete mode 100644 res/drawable-hdpi/action_moreoverflow.png delete mode 100644 res/drawable-hdpi/action_offline.png delete mode 100644 res/drawable-hdpi/action_play_all.png delete mode 100644 res/drawable-hdpi/action_refresh.png delete mode 100644 res/drawable-hdpi/action_remove_all.png delete mode 100644 res/drawable-hdpi/action_save.png delete mode 100644 res/drawable-hdpi/action_screen_on_off.png delete mode 100644 res/drawable-hdpi/action_search.png delete mode 100644 res/drawable-hdpi/action_select.png delete mode 100644 res/drawable-hdpi/action_settings.png delete mode 100644 res/drawable-hdpi/action_share.png delete mode 100644 res/drawable-hdpi/action_shuffle.png delete mode 100644 res/drawable-hdpi/ic_menu_exit.png delete mode 100644 res/drawable-hdpi/ic_menu_help.png delete mode 100644 res/drawable-hdpi/ic_menu_settings.png delete mode 100644 res/drawable-hdpi/ic_menu_shuffle.png create mode 100644 res/drawable-hdpi/ic_menu_shuffle_dark.png create mode 100644 res/drawable-hdpi/ic_menu_shuffle_light.png delete mode 100644 res/drawable-hdpi/main_offline.png delete mode 100644 res/drawable-hdpi/volume.png create mode 100644 res/drawable-mdpi/ic_menu_shuffle_dark.png create mode 100644 res/drawable-mdpi/ic_menu_shuffle_light.png create mode 100644 res/drawable-xhdpi/ic_menu_shuffle_dark.png create mode 100644 res/drawable-xhdpi/ic_menu_shuffle_light.png create mode 100644 res/drawable-xxhdpi/ic_menu_shuffle_dark.png create mode 100644 res/drawable-xxhdpi/ic_menu_shuffle_light.png diff --git a/res/drawable-hdpi/action_browse.png b/res/drawable-hdpi/action_browse.png deleted file mode 100644 index 54296909..00000000 Binary files a/res/drawable-hdpi/action_browse.png and /dev/null differ diff --git a/res/drawable-hdpi/action_compass.png b/res/drawable-hdpi/action_compass.png deleted file mode 100644 index 39760f89..00000000 Binary files a/res/drawable-hdpi/action_compass.png and /dev/null differ diff --git a/res/drawable-hdpi/action_exit.png b/res/drawable-hdpi/action_exit.png deleted file mode 100644 index 09e18dee..00000000 Binary files a/res/drawable-hdpi/action_exit.png and /dev/null differ diff --git a/res/drawable-hdpi/action_help.png b/res/drawable-hdpi/action_help.png deleted file mode 100644 index aaf8304c..00000000 Binary files a/res/drawable-hdpi/action_help.png and /dev/null differ diff --git a/res/drawable-hdpi/action_moreoverflow.png b/res/drawable-hdpi/action_moreoverflow.png deleted file mode 100644 index cb6ebdaf..00000000 Binary files a/res/drawable-hdpi/action_moreoverflow.png and /dev/null differ diff --git a/res/drawable-hdpi/action_offline.png b/res/drawable-hdpi/action_offline.png deleted file mode 100644 index a85f0931..00000000 Binary files a/res/drawable-hdpi/action_offline.png and /dev/null differ diff --git a/res/drawable-hdpi/action_play_all.png b/res/drawable-hdpi/action_play_all.png deleted file mode 100644 index 6ce5629a..00000000 Binary files a/res/drawable-hdpi/action_play_all.png and /dev/null differ diff --git a/res/drawable-hdpi/action_refresh.png b/res/drawable-hdpi/action_refresh.png deleted file mode 100644 index 9f30dc95..00000000 Binary files a/res/drawable-hdpi/action_refresh.png and /dev/null differ diff --git a/res/drawable-hdpi/action_remove_all.png b/res/drawable-hdpi/action_remove_all.png deleted file mode 100644 index 97b88837..00000000 Binary files a/res/drawable-hdpi/action_remove_all.png and /dev/null differ diff --git a/res/drawable-hdpi/action_save.png b/res/drawable-hdpi/action_save.png deleted file mode 100644 index 7bda97d6..00000000 Binary files a/res/drawable-hdpi/action_save.png and /dev/null differ diff --git a/res/drawable-hdpi/action_screen_on_off.png b/res/drawable-hdpi/action_screen_on_off.png deleted file mode 100644 index c7168563..00000000 Binary files a/res/drawable-hdpi/action_screen_on_off.png and /dev/null differ diff --git a/res/drawable-hdpi/action_search.png b/res/drawable-hdpi/action_search.png deleted file mode 100644 index 6bc3d426..00000000 Binary files a/res/drawable-hdpi/action_search.png and /dev/null differ diff --git a/res/drawable-hdpi/action_select.png b/res/drawable-hdpi/action_select.png deleted file mode 100644 index e9e83e3d..00000000 Binary files a/res/drawable-hdpi/action_select.png and /dev/null differ diff --git a/res/drawable-hdpi/action_settings.png b/res/drawable-hdpi/action_settings.png deleted file mode 100644 index 1ab7722b..00000000 Binary files a/res/drawable-hdpi/action_settings.png and /dev/null differ diff --git a/res/drawable-hdpi/action_share.png b/res/drawable-hdpi/action_share.png deleted file mode 100644 index 28376157..00000000 Binary files a/res/drawable-hdpi/action_share.png and /dev/null differ diff --git a/res/drawable-hdpi/action_shuffle.png b/res/drawable-hdpi/action_shuffle.png deleted file mode 100644 index 0613965c..00000000 Binary files a/res/drawable-hdpi/action_shuffle.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_menu_chat_dark.png b/res/drawable-hdpi/ic_menu_chat_dark.png index be04b06e..75363fce 100644 Binary files a/res/drawable-hdpi/ic_menu_chat_dark.png and b/res/drawable-hdpi/ic_menu_chat_dark.png differ diff --git a/res/drawable-hdpi/ic_menu_chat_light.png b/res/drawable-hdpi/ic_menu_chat_light.png index 3f58695c..e28933e4 100644 Binary files a/res/drawable-hdpi/ic_menu_chat_light.png and b/res/drawable-hdpi/ic_menu_chat_light.png differ diff --git a/res/drawable-hdpi/ic_menu_chat_send_dark.png b/res/drawable-hdpi/ic_menu_chat_send_dark.png index bd37dc59..c0e9b372 100644 Binary files a/res/drawable-hdpi/ic_menu_chat_send_dark.png and b/res/drawable-hdpi/ic_menu_chat_send_dark.png differ diff --git a/res/drawable-hdpi/ic_menu_chat_send_light.png b/res/drawable-hdpi/ic_menu_chat_send_light.png index 0c870d2c..ebcfe9e8 100644 Binary files a/res/drawable-hdpi/ic_menu_chat_send_light.png and b/res/drawable-hdpi/ic_menu_chat_send_light.png differ diff --git a/res/drawable-hdpi/ic_menu_exit.png b/res/drawable-hdpi/ic_menu_exit.png deleted file mode 100644 index 847a1ed3..00000000 Binary files a/res/drawable-hdpi/ic_menu_exit.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_menu_help.png b/res/drawable-hdpi/ic_menu_help.png deleted file mode 100644 index 9f11f434..00000000 Binary files a/res/drawable-hdpi/ic_menu_help.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_menu_settings.png b/res/drawable-hdpi/ic_menu_settings.png deleted file mode 100644 index 48775c1e..00000000 Binary files a/res/drawable-hdpi/ic_menu_settings.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_menu_shuffle.png b/res/drawable-hdpi/ic_menu_shuffle.png deleted file mode 100644 index 0613965c..00000000 Binary files a/res/drawable-hdpi/ic_menu_shuffle.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_menu_shuffle_dark.png b/res/drawable-hdpi/ic_menu_shuffle_dark.png new file mode 100644 index 00000000..f77cfed2 Binary files /dev/null and b/res/drawable-hdpi/ic_menu_shuffle_dark.png differ diff --git a/res/drawable-hdpi/ic_menu_shuffle_light.png b/res/drawable-hdpi/ic_menu_shuffle_light.png new file mode 100644 index 00000000..ded93939 Binary files /dev/null and b/res/drawable-hdpi/ic_menu_shuffle_light.png differ diff --git a/res/drawable-hdpi/main_offline.png b/res/drawable-hdpi/main_offline.png deleted file mode 100644 index a1d27cec..00000000 Binary files a/res/drawable-hdpi/main_offline.png and /dev/null differ diff --git a/res/drawable-hdpi/main_offline_light.png b/res/drawable-hdpi/main_offline_light.png index 69bee782..cabca581 100644 Binary files a/res/drawable-hdpi/main_offline_light.png and b/res/drawable-hdpi/main_offline_light.png differ diff --git a/res/drawable-hdpi/volume.png b/res/drawable-hdpi/volume.png deleted file mode 100644 index 95134dfd..00000000 Binary files a/res/drawable-hdpi/volume.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_menu_shuffle_dark.png b/res/drawable-mdpi/ic_menu_shuffle_dark.png new file mode 100644 index 00000000..7007fde5 Binary files /dev/null and b/res/drawable-mdpi/ic_menu_shuffle_dark.png differ diff --git a/res/drawable-mdpi/ic_menu_shuffle_light.png b/res/drawable-mdpi/ic_menu_shuffle_light.png new file mode 100644 index 00000000..4d07c3b4 Binary files /dev/null and b/res/drawable-mdpi/ic_menu_shuffle_light.png differ diff --git a/res/drawable-xhdpi/ic_menu_shuffle_dark.png b/res/drawable-xhdpi/ic_menu_shuffle_dark.png new file mode 100644 index 00000000..e3a31a84 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_shuffle_dark.png differ diff --git a/res/drawable-xhdpi/ic_menu_shuffle_light.png b/res/drawable-xhdpi/ic_menu_shuffle_light.png new file mode 100644 index 00000000..14eb942c Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_shuffle_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_shuffle_dark.png b/res/drawable-xxhdpi/ic_menu_shuffle_dark.png new file mode 100644 index 00000000..b53733df Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_shuffle_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_shuffle_light.png b/res/drawable-xxhdpi/ic_menu_shuffle_light.png new file mode 100644 index 00000000..4d5dff32 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_shuffle_light.png differ diff --git a/res/layout/jukebox_volume.xml b/res/layout/jukebox_volume.xml index 4bccaec7..fd718326 100644 --- a/res/layout/jukebox_volume.xml +++ b/res/layout/jukebox_volume.xml @@ -32,7 +32,7 @@ android:paddingRight="12dip" android:layout_alignParentLeft="true" android:layout_below="@+id/jukebox_volume_title" - android:src="@drawable/volume"/> + android:src="?attr/volume"/> 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"> \ 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 @@ 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"> 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"> 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"> + android:title="@string/download.menu_screen_on"/> 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"> @@ -13,6 +13,5 @@ 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 @@ + android:title="@string/download.menu_screen_on"/> 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"> 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"> 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"> 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"> 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"> \ 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"> @@ -13,6 +13,5 @@ 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"> 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"> \ 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"> + android:title="@string/menu.select"/> + android:title="@string/common.download"/> + android:title="@string/common.pin"/> + android:title="@string/common.delete"/> + android:title="@string/menu.play_last"/> 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"> + android:title="@string/menu.select"/> + android:title="@string/common.delete"/> + android:title="@string/menu.play_last"/> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index d2b53374..e54db415 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -8,6 +8,12 @@ - - + + + + + + + + diff --git a/res/values/themes.xml b/res/values/themes.xml index 9e10376b..1d8ddcf0 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -13,6 +13,12 @@ @drawable/ic_menu_chat_light @drawable/ic_menu_chat_send_light @drawable/download_none_light + @drawable/ic_menu_shuffle_light + @drawable/ic_menu_refresh_light + @drawable/ic_menu_search_light + @drawable/ic_menu_remove_light + @drawable/ic_menu_save_light + @drawable/ic_action_volume_light @style/DSub.TextViewStyle @style/DSub.ButtonStyle @@ -20,7 +26,7 @@ @style/Widget.DSub.ActionBarStyle.Dark @style/Widget.DSub.ActionBarStyle.Dark @color/cyan - @drawable/main_offline + @drawable/main_offline_dark @drawable/media_backward_dark @drawable/media_forward_dark @drawable/media_pause_dark @@ -30,6 +36,12 @@ @drawable/ic_menu_chat_dark @drawable/ic_menu_chat_send_dark @drawable/download_none_dark + @drawable/ic_menu_shuffle_dark + @drawable/ic_menu_refresh_dark + @drawable/ic_menu_search_dark + @drawable/ic_menu_remove_dark + @drawable/ic_menu_save_dark + @drawable/ic_action_volume_dark @style/DSub.TextViewStyle @style/DSub.ButtonStyle @@ -41,16 +53,22 @@ @style/Widget.DSub.ActionBarStyle.Holo @color/cyan @drawable/background - @drawable/main_offline + @drawable/main_offline_dark @drawable/media_backward_dark @drawable/media_forward_dark @drawable/media_pause_dark @drawable/media_repeat_off @drawable/media_start_dark @drawable/media_stop_dark - @drawable/ic_menu_chat_dark + @drawable/ic_menu_chat_dark @drawable/ic_menu_chat_send_dark @drawable/download_none_dark + @drawable/ic_menu_shuffle_dark + @drawable/ic_menu_refresh_dark + @drawable/ic_menu_search_dark + @drawable/ic_menu_remove_dark + @drawable/ic_menu_save_dark + @drawable/ic_action_volume_dark @style/DSub.TextViewStyle @style/DSub.ButtonStyle -- cgit v1.2.3