From 596fab757c5852dcdb9e0c681cc92fb3efd2b831 Mon Sep 17 00:00:00 2001 From: Joshua Bahnsen Date: Thu, 16 May 2013 00:59:55 -0700 Subject: [PATCH] Major import from DSub for stability and quality --- gen/com/handmark/pulltorefresh/library/R.java | 20 +- .../thejoshwa/ultrasonic/androidapp/R.java | 1138 +++++++++-------- res/drawable/drop_shadow.xml | 11 + res/layout-land/download.xml | 83 +- res/layout-port/download.xml | 95 +- res/layout/album_buttons.xml | 2 +- res/layout/equalizer.xml | 60 +- res/layout/media_buttons.xml | 81 ++ res/layout/now_playing.xml | 17 +- res/layout/playlist_list_item.xml | 26 +- res/layout/update_playlist.xml | 70 + res/menu/select_playlist_context.xml | 23 + res/menu/select_playlist_context_offline.xml | 11 + res/values/strings.xml | 30 +- res/xml/settings.xml | 10 + .../androidapp/activity/DownloadActivity.java | 406 ++++-- .../androidapp/activity/GenericActivity.java | 5 - .../androidapp/activity/MainActivity.java | 6 - .../activity/PlayVideoActivity.java | 3 +- .../androidapp/activity/SearchActivity.java | 18 +- .../activity/SelectAlbumActivity.java | 111 +- .../activity/SelectArtistActivity.java | 12 +- .../activity/SelectPlaylistActivity.java | 173 ++- .../androidapp/activity/SettingsActivity.java | 8 + .../activity/SubsonicTabActivity.java | 331 +++-- .../audiofx/EqualizerController.java | 18 +- .../audiofx/VisualizerController.java | 19 +- .../ultrasonic/androidapp/domain/Artist.java | 9 + .../ultrasonic/androidapp/domain/Indexes.java | 15 +- .../androidapp/domain/MusicDirectory.java | 13 + .../androidapp/domain/Playlist.java | 55 +- .../service/CachedMusicService.java | 49 +- .../androidapp/service/DownloadFile.java | 140 +- .../androidapp/service/DownloadService.java | 20 +- .../service/DownloadServiceImpl.java | 911 +++++++++---- .../DownloadServiceLifecycleSupport.java | 113 +- .../androidapp/service/MusicService.java | 22 +- .../service/OfflineMusicService.java | 225 +++- .../androidapp/service/RESTMusicService.java | 467 ++++--- .../service/parser/AlbumListParser.java | 2 +- .../parser/MusicDirectoryEntryParser.java | 6 +- .../service/parser/MusicDirectoryParser.java | 5 +- .../service/parser/PlaylistParser.java | 2 +- .../service/parser/PlaylistsParser.java | 11 +- .../service/parser/RandomSongsParser.java | 2 +- .../service/parser/SearchResult2Parser.java | 4 +- .../service/parser/SearchResultParser.java | 2 +- .../androidapp/util/CacheCleaner.java | 207 +-- .../androidapp/util/CancellableTask.java | 8 +- .../ultrasonic/androidapp/util/Constants.java | 9 + .../ultrasonic/androidapp/util/FileUtil.java | 104 +- .../ultrasonic/androidapp/util/LRUCache.java | 13 + .../androidapp/util/LoadingTask.java | 86 ++ .../androidapp/util/ShufflePlayBuffer.java | 13 +- .../androidapp/util/StreamProxy.java | 213 ++- .../ultrasonic/androidapp/util/Util.java | 55 + .../androidapp/{util => view}/AlbumView.java | 7 +- .../{util => view}/ArtistAdapter.java | 2 +- .../androidapp/view/AutoRepeatButton.java | 86 ++ .../{util => view}/EntryAdapter.java | 3 +- .../{util => view}/GenreAdapter.java | 2 +- .../androidapp/view/PlaylistAdapter.java | 51 + .../androidapp/view/PlaylistView.java | 47 + .../androidapp/{util => view}/SongView.java | 78 +- .../androidapp/view/UpdateView.java | 115 ++ 65 files changed, 4041 insertions(+), 1918 deletions(-) create mode 100644 res/drawable/drop_shadow.xml create mode 100644 res/layout/media_buttons.xml create mode 100644 res/layout/update_playlist.xml create mode 100644 res/menu/select_playlist_context.xml create mode 100644 res/menu/select_playlist_context_offline.xml delete mode 100644 src/com/thejoshwa/ultrasonic/androidapp/activity/GenericActivity.java create mode 100644 src/com/thejoshwa/ultrasonic/androidapp/util/LoadingTask.java rename src/com/thejoshwa/ultrasonic/androidapp/{util => view}/AlbumView.java (94%) rename src/com/thejoshwa/ultrasonic/androidapp/{util => view}/ArtistAdapter.java (98%) create mode 100644 src/com/thejoshwa/ultrasonic/androidapp/view/AutoRepeatButton.java rename src/com/thejoshwa/ultrasonic/androidapp/{util => view}/EntryAdapter.java (95%) rename src/com/thejoshwa/ultrasonic/androidapp/{util => view}/GenreAdapter.java (97%) create mode 100644 src/com/thejoshwa/ultrasonic/androidapp/view/PlaylistAdapter.java create mode 100644 src/com/thejoshwa/ultrasonic/androidapp/view/PlaylistView.java rename src/com/thejoshwa/ultrasonic/androidapp/{util => view}/SongView.java (82%) create mode 100644 src/com/thejoshwa/ultrasonic/androidapp/view/UpdateView.java diff --git a/gen/com/handmark/pulltorefresh/library/R.java b/gen/com/handmark/pulltorefresh/library/R.java index 08b77b34..107ea8f0 100644 --- a/gen/com/handmark/pulltorefresh/library/R.java +++ b/gen/com/handmark/pulltorefresh/library/R.java @@ -9,19 +9,19 @@ package com.handmark.pulltorefresh.library; public final class R { public static final class id { public static final int pullFromStart = 0x7f060001; - public static final int pull_to_refresh_progress = 0x7f06007f; + public static final int pull_to_refresh_progress = 0x7f060081; public static final int rotate = 0x7f060007; public static final int both = 0x7f060003; public static final int webview = 0x7f06000a; - public static final int pull_to_refresh_text = 0x7f060080; + public static final int pull_to_refresh_text = 0x7f060082; public static final int pullDownFromTop = 0x7f060005; public static final int gridview = 0x7f060009; public static final int pullUpFromBottom = 0x7f060006; public static final int scrollview = 0x7f06000b; public static final int pullFromEnd = 0x7f060002; - public static final int pull_to_refresh_image = 0x7f06007e; - public static final int pull_to_refresh_sub_text = 0x7f060081; - public static final int fl_inner = 0x7f06007d; + public static final int pull_to_refresh_image = 0x7f060080; + public static final int pull_to_refresh_sub_text = 0x7f060083; + public static final int fl_inner = 0x7f06007f; public static final int flip = 0x7f060008; public static final int disabled = 0x7f060000; public static final int manualOnly = 0x7f060004; @@ -41,8 +41,8 @@ public final class R { public static final int pull_to_refresh_from_bottom_release_label = 0x7f080004; } public static final class layout { - public static final int pull_to_refresh_header_vertical = 0x7f030018; - public static final int pull_to_refresh_header_horizontal = 0x7f030017; + public static final int pull_to_refresh_header_vertical = 0x7f030019; + public static final int pull_to_refresh_header_horizontal = 0x7f030018; } public static final class styleable { public static final int PullToRefresh_ptrDrawableStart = 7; @@ -67,10 +67,10 @@ public final class R { public static final int PullToRefresh_ptrHeaderSubTextColor = 3; } public static final class drawable { - public static final int indicator_bg_top = 0x7f020045; - public static final int indicator_bg_bottom = 0x7f020044; + public static final int indicator_bg_top = 0x7f020046; + public static final int indicator_bg_bottom = 0x7f020045; public static final int default_ptr_flip = 0x7f02000c; - public static final int indicator_arrow = 0x7f020043; + public static final int indicator_arrow = 0x7f020044; public static final int default_ptr_rotate = 0x7f02000d; } public static final class attr { diff --git a/gen/com/thejoshwa/ultrasonic/androidapp/R.java b/gen/com/thejoshwa/ultrasonic/androidapp/R.java index d07b2875..33c2b8fd 100644 --- a/gen/com/thejoshwa/ultrasonic/androidapp/R.java +++ b/gen/com/thejoshwa/ultrasonic/androidapp/R.java @@ -452,227 +452,234 @@ or to a theme attribute in the form "?[package:][type:]na public static final int buttonbar_selector=0x7f02000b; public static final int default_ptr_flip=0x7f02000c; public static final int default_ptr_rotate=0x7f02000d; - public static final int ic_appwidget_music_next=0x7f02000e; - public static final int ic_appwidget_music_pause=0x7f02000f; - public static final int ic_appwidget_music_play=0x7f020010; - public static final int ic_appwidget_music_previous=0x7f020011; - public static final int ic_launcher=0x7f020012; - public static final int ic_menu_about_dark=0x7f020013; - public static final int ic_menu_about_light=0x7f020014; - public static final int ic_menu_add_to_queue_dark=0x7f020015; - public static final int ic_menu_add_to_queue_light=0x7f020016; - public static final int ic_menu_backward_dark=0x7f020017; - public static final int ic_menu_backward_light=0x7f020018; - public static final int ic_menu_browse_dark=0x7f020019; - public static final int ic_menu_browse_light=0x7f02001a; - public static final int ic_menu_exit_dark=0x7f02001b; - public static final int ic_menu_exit_light=0x7f02001c; - public static final int ic_menu_forward_dark=0x7f02001d; - public static final int ic_menu_forward_light=0x7f02001e; - public static final int ic_menu_help_dark=0x7f02001f; - public static final int ic_menu_help_light=0x7f020020; - public static final int ic_menu_home_dark=0x7f020021; - public static final int ic_menu_home_light=0x7f020022; - public static final int ic_menu_pin=0x7f020023; - public static final int ic_menu_playlists_dark=0x7f020024; - public static final int ic_menu_playlists_light=0x7f020025; - public static final int ic_menu_remove_all_dark=0x7f020026; - public static final int ic_menu_remove_all_light=0x7f020027; - public static final int ic_menu_save_dark=0x7f020028; - public static final int ic_menu_save_light=0x7f020029; - public static final int ic_menu_screen_on_off_dark=0x7f02002a; - public static final int ic_menu_screen_on_off_light=0x7f02002b; - public static final int ic_menu_search_dark=0x7f02002c; - public static final int ic_menu_search_light=0x7f02002d; - public static final int ic_menu_select_all_dark=0x7f02002e; - public static final int ic_menu_select_all_light=0x7f02002f; - public static final int ic_menu_select_folder_dark=0x7f020030; - public static final int ic_menu_select_folder_light=0x7f020031; - public static final int ic_menu_settings_dark=0x7f020032; - public static final int ic_menu_settings_light=0x7f020033; - public static final int ic_menu_share_dark=0x7f020034; - public static final int ic_menu_share_light=0x7f020035; - public static final int ic_menu_unpin_dark=0x7f020036; - public static final int ic_menu_unpin_light=0x7f020037; - public static final int ic_star_full_dark=0x7f020038; - public static final int ic_star_full_light=0x7f020039; - public static final int ic_star_hollow_dark=0x7f02003a; - public static final int ic_star_hollow_light=0x7f02003b; - public static final int ic_stat_downloaded_dark=0x7f02003c; - public static final int ic_stat_downloaded_light=0x7f02003d; - public static final int ic_stat_downloading_dark=0x7f02003e; - public static final int ic_stat_downloading_light=0x7f02003f; - public static final int ic_stat_play_dark=0x7f020040; - public static final int ic_stat_play_light=0x7f020041; - public static final int ic_stat_ultrasonic=0x7f020042; - public static final int indicator_arrow=0x7f020043; - public static final int indicator_bg_bottom=0x7f020044; - public static final int indicator_bg_top=0x7f020045; - public static final int list_background=0x7f020046; - public static final int list_focused_holo=0x7f020047; - public static final int list_longpressed_holo=0x7f020048; - public static final int list_pressed_holo_dark=0x7f020049; - public static final int list_pressed_holo_light=0x7f02004a; - public static final int list_selector_background_transition_holo_dark=0x7f02004b; - public static final int list_selector_background_transition_holo_light=0x7f02004c; - public static final int list_selector_disabled_holo_dark=0x7f02004d; - public static final int list_selector_disabled_holo_light=0x7f02004e; - public static final int list_selector_holo_dark=0x7f02004f; - public static final int list_selector_holo_light=0x7f020050; - public static final int main_header_icon=0x7f020051; - public static final int md__category_background=0x7f020052; - public static final int md__list_focused_holo=0x7f020053; - public static final int md__list_longpressed_holo=0x7f020054; - public static final int md__list_pressed_holo_dark=0x7f020055; - public static final int md__list_selector_background_transition_holo_dark=0x7f020056; - public static final int md__list_selector_disabled_holo_dark=0x7f020057; - public static final int md__list_selector_holo_dark=0x7f020058; - public static final int media_backward_normal=0x7f020059; - public static final int media_backward_normal_dark=0x7f02005a; - public static final int media_backward_normal_light=0x7f02005b; - public static final int media_forward_normal=0x7f02005c; - public static final int media_forward_normal_dark=0x7f02005d; - public static final int media_forward_normal_light=0x7f02005e; - public static final int media_pause_normal=0x7f02005f; - public static final int media_pause_normal_dark=0x7f020060; - public static final int media_pause_normal_light=0x7f020061; - public static final int media_play_next=0x7f020062; - public static final int media_play_next_dark=0x7f020063; - public static final int media_play_next_light=0x7f020064; - public static final int media_play_now_dark=0x7f020065; - public static final int media_play_now_light=0x7f020066; - public static final int media_repeat_all=0x7f020067; - public static final int media_repeat_off=0x7f020068; - public static final int media_repeat_off_dark=0x7f020069; - public static final int media_repeat_off_light=0x7f02006a; - public static final int media_repeat_single=0x7f02006b; - public static final int media_shuffle_normal=0x7f02006c; - public static final int media_shuffle_normal_dark=0x7f02006d; - public static final int media_shuffle_normal_light=0x7f02006e; - public static final int media_start_normal=0x7f02006f; - public static final int media_start_normal_dark=0x7f020070; - public static final int media_start_normal_light=0x7f020071; - public static final int media_start_pressed=0x7f020072; - public static final int media_stop_normal=0x7f020073; - public static final int media_stop_normal_dark=0x7f020074; - public static final int media_stop_normal_light=0x7f020075; - public static final int media_toggle_list_normal=0x7f020076; - public static final int media_toggle_list_normal_dark=0x7f020077; - public static final int media_toggle_list_normal_light=0x7f020078; - public static final int menu_arrow=0x7f020079; - public static final int menu_arrow_bottom=0x7f02007a; - public static final int menu_arrow_right=0x7f02007b; - public static final int menu_arrow_top=0x7f02007c; - public static final int menubar_button_disabled=0x7f02007d; - public static final int menubar_button_normal=0x7f02007e; - public static final int notify_panel_notification_icon_bg=0x7f02007f; - public static final int pinstripe_tile=0x7f020080; - public static final int preview=0x7f020081; - public static final int preview_two=0x7f020082; - public static final int progress_bg_holo_dark=0x7f020083; - public static final int progress_horizontal_holo_dark=0x7f020084; - public static final int progress_primary_holo_dark=0x7f020085; - public static final int progress_secondary_holo_dark=0x7f020086; - public static final int select_album_play_all=0x7f020087; - public static final int select_album_play_all_normal=0x7f020088; - public static final int select_album_play_all_pressed=0x7f020089; - public static final int status_bg=0x7f02008a; - public static final int title_bar_shadow=0x7f02008b; - public static final int unknown_album=0x7f02008c; - public static final int unknown_album_large=0x7f02008d; + public static final int drop_shadow=0x7f02000e; + public static final int ic_appwidget_music_next=0x7f02000f; + public static final int ic_appwidget_music_pause=0x7f020010; + public static final int ic_appwidget_music_play=0x7f020011; + public static final int ic_appwidget_music_previous=0x7f020012; + public static final int ic_launcher=0x7f020013; + public static final int ic_menu_about_dark=0x7f020014; + public static final int ic_menu_about_light=0x7f020015; + public static final int ic_menu_add_to_queue_dark=0x7f020016; + public static final int ic_menu_add_to_queue_light=0x7f020017; + public static final int ic_menu_backward_dark=0x7f020018; + public static final int ic_menu_backward_light=0x7f020019; + public static final int ic_menu_browse_dark=0x7f02001a; + public static final int ic_menu_browse_light=0x7f02001b; + public static final int ic_menu_exit_dark=0x7f02001c; + public static final int ic_menu_exit_light=0x7f02001d; + public static final int ic_menu_forward_dark=0x7f02001e; + public static final int ic_menu_forward_light=0x7f02001f; + public static final int ic_menu_help_dark=0x7f020020; + public static final int ic_menu_help_light=0x7f020021; + public static final int ic_menu_home_dark=0x7f020022; + public static final int ic_menu_home_light=0x7f020023; + public static final int ic_menu_pin=0x7f020024; + public static final int ic_menu_playlists_dark=0x7f020025; + public static final int ic_menu_playlists_light=0x7f020026; + public static final int ic_menu_remove_all_dark=0x7f020027; + public static final int ic_menu_remove_all_light=0x7f020028; + public static final int ic_menu_save_dark=0x7f020029; + public static final int ic_menu_save_light=0x7f02002a; + public static final int ic_menu_screen_on_off_dark=0x7f02002b; + public static final int ic_menu_screen_on_off_light=0x7f02002c; + public static final int ic_menu_search_dark=0x7f02002d; + public static final int ic_menu_search_light=0x7f02002e; + public static final int ic_menu_select_all_dark=0x7f02002f; + public static final int ic_menu_select_all_light=0x7f020030; + public static final int ic_menu_select_folder_dark=0x7f020031; + public static final int ic_menu_select_folder_light=0x7f020032; + public static final int ic_menu_settings_dark=0x7f020033; + public static final int ic_menu_settings_light=0x7f020034; + public static final int ic_menu_share_dark=0x7f020035; + public static final int ic_menu_share_light=0x7f020036; + public static final int ic_menu_unpin_dark=0x7f020037; + public static final int ic_menu_unpin_light=0x7f020038; + public static final int ic_star_full_dark=0x7f020039; + public static final int ic_star_full_light=0x7f02003a; + public static final int ic_star_hollow_dark=0x7f02003b; + public static final int ic_star_hollow_light=0x7f02003c; + public static final int ic_stat_downloaded_dark=0x7f02003d; + public static final int ic_stat_downloaded_light=0x7f02003e; + public static final int ic_stat_downloading_dark=0x7f02003f; + public static final int ic_stat_downloading_light=0x7f020040; + public static final int ic_stat_play_dark=0x7f020041; + public static final int ic_stat_play_light=0x7f020042; + public static final int ic_stat_ultrasonic=0x7f020043; + public static final int indicator_arrow=0x7f020044; + public static final int indicator_bg_bottom=0x7f020045; + public static final int indicator_bg_top=0x7f020046; + public static final int list_background=0x7f020047; + public static final int list_focused_holo=0x7f020048; + public static final int list_longpressed_holo=0x7f020049; + public static final int list_pressed_holo_dark=0x7f02004a; + public static final int list_pressed_holo_light=0x7f02004b; + public static final int list_selector_background_transition_holo_dark=0x7f02004c; + public static final int list_selector_background_transition_holo_light=0x7f02004d; + public static final int list_selector_disabled_holo_dark=0x7f02004e; + public static final int list_selector_disabled_holo_light=0x7f02004f; + public static final int list_selector_holo_dark=0x7f020050; + public static final int list_selector_holo_light=0x7f020051; + public static final int main_header_icon=0x7f020052; + public static final int md__category_background=0x7f020053; + public static final int md__list_focused_holo=0x7f020054; + public static final int md__list_longpressed_holo=0x7f020055; + public static final int md__list_pressed_holo_dark=0x7f020056; + public static final int md__list_selector_background_transition_holo_dark=0x7f020057; + public static final int md__list_selector_disabled_holo_dark=0x7f020058; + public static final int md__list_selector_holo_dark=0x7f020059; + public static final int media_backward_normal=0x7f02005a; + public static final int media_backward_normal_dark=0x7f02005b; + public static final int media_backward_normal_light=0x7f02005c; + public static final int media_forward_normal=0x7f02005d; + public static final int media_forward_normal_dark=0x7f02005e; + public static final int media_forward_normal_light=0x7f02005f; + public static final int media_pause_normal=0x7f020060; + public static final int media_pause_normal_dark=0x7f020061; + public static final int media_pause_normal_light=0x7f020062; + public static final int media_play_next=0x7f020063; + public static final int media_play_next_dark=0x7f020064; + public static final int media_play_next_light=0x7f020065; + public static final int media_play_now_dark=0x7f020066; + public static final int media_play_now_light=0x7f020067; + public static final int media_repeat_all=0x7f020068; + public static final int media_repeat_off=0x7f020069; + public static final int media_repeat_off_dark=0x7f02006a; + public static final int media_repeat_off_light=0x7f02006b; + public static final int media_repeat_single=0x7f02006c; + public static final int media_shuffle_normal=0x7f02006d; + public static final int media_shuffle_normal_dark=0x7f02006e; + public static final int media_shuffle_normal_light=0x7f02006f; + public static final int media_start_normal=0x7f020070; + public static final int media_start_normal_dark=0x7f020071; + public static final int media_start_normal_light=0x7f020072; + public static final int media_start_pressed=0x7f020073; + public static final int media_stop_normal=0x7f020074; + public static final int media_stop_normal_dark=0x7f020075; + public static final int media_stop_normal_light=0x7f020076; + public static final int media_toggle_list_normal=0x7f020077; + public static final int media_toggle_list_normal_dark=0x7f020078; + public static final int media_toggle_list_normal_light=0x7f020079; + public static final int menu_arrow=0x7f02007a; + public static final int menu_arrow_bottom=0x7f02007b; + public static final int menu_arrow_right=0x7f02007c; + public static final int menu_arrow_top=0x7f02007d; + public static final int menubar_button_disabled=0x7f02007e; + public static final int menubar_button_normal=0x7f02007f; + public static final int notify_panel_notification_icon_bg=0x7f020080; + public static final int pinstripe_tile=0x7f020081; + public static final int preview=0x7f020082; + public static final int preview_two=0x7f020083; + public static final int progress_bg_holo_dark=0x7f020084; + public static final int progress_horizontal_holo_dark=0x7f020085; + public static final int progress_primary_holo_dark=0x7f020086; + public static final int progress_secondary_holo_dark=0x7f020087; + public static final int select_album_play_all=0x7f020088; + public static final int select_album_play_all_normal=0x7f020089; + public static final int select_album_play_all_pressed=0x7f02008a; + public static final int status_bg=0x7f02008b; + public static final int title_bar_shadow=0x7f02008c; + public static final int unknown_album=0x7f02008d; + public static final int unknown_album_large=0x7f02008e; } public static final class id { public static final int album=0x7f060074; public static final int album_artist=0x7f06001d; public static final int album_coverart=0x7f06001b; - public static final int album_menu_pin=0x7f0600b4; - public static final int album_menu_play_last=0x7f0600b3; - public static final int album_menu_play_next=0x7f0600b2; - public static final int album_menu_play_now=0x7f0600b1; + public static final int album_menu_pin=0x7f0600bc; + public static final int album_menu_play_last=0x7f0600bb; + public static final int album_menu_play_next=0x7f0600ba; + public static final int album_menu_play_now=0x7f0600b9; public static final int album_star=0x7f06001e; public static final int album_title=0x7f06001c; public static final int appwidget_coverart=0x7f06001f; public static final int appwidget_top=0x7f060021; public static final int artist=0x7f060023; - public static final int artist_menu_pin=0x7f0600b8; - public static final int artist_menu_play_last=0x7f0600b7; - public static final int artist_menu_play_next=0x7f0600b6; - public static final int artist_menu_play_now=0x7f0600b5; + public static final int artist_menu_pin=0x7f0600c0; + public static final int artist_menu_play_last=0x7f0600bf; + public static final int artist_menu_play_next=0x7f0600be; + public static final int artist_menu_play_now=0x7f0600bd; public static final int both=0x7f060003; public static final int control_next=0x7f060026; public static final int control_play=0x7f060025; public static final int control_previous=0x7f060024; public static final int control_stop=0x7f060075; public static final int disabled=0x7f060000; - public static final int download_album=0x7f06003b; - public static final int download_album_art_image=0x7f060035; - public static final int download_album_art_layout=0x7f060034; - public static final int download_artist=0x7f06003a; - public static final int download_button_bar_flipper=0x7f060037; + public static final int download_album=0x7f060032; + public static final int download_album_art_image=0x7f06002c; + public static final int download_album_art_layout=0x7f06002b; + public static final int download_artist=0x7f060031; + public static final int download_button_bar_flipper=0x7f06002e; public static final int download_control_layout=0x7f060027; - public static final int download_duration=0x7f060039; - public static final int download_empty=0x7f06003c; - public static final int download_equalizer=0x7f0600a6; - public static final int download_jukebox=0x7f0600a8; - public static final int download_list=0x7f06003d; - public static final int download_next=0x7f06002e; - public static final int download_pause=0x7f06002c; - public static final int download_playlist_flipper=0x7f060033; - public static final int download_position=0x7f060038; - public static final int download_previous=0x7f06002a; - public static final int download_progress_bar=0x7f06003e; - public static final int download_repeat=0x7f06002f; - public static final int download_shuffle=0x7f060029; - public static final int download_song_title=0x7f060032; - public static final int download_star=0x7f060030; - public static final int download_start=0x7f06002b; - public static final int download_status=0x7f060031; - public static final int download_stop=0x7f06002d; - public static final int download_toggle_list=0x7f060028; - public static final int download_visualizer=0x7f0600a7; - public static final int download_visualizer_view_layout=0x7f060036; - public static final int equalizer_bar=0x7f060044; - public static final int equalizer_frequency=0x7f060042; - public static final int equalizer_level=0x7f060043; - public static final int equalizer_enabled=0x7f06003f; - public static final int equalizer_layout=0x7f060040; - public static final int equalizer_preset=0x7f060041; - public static final int fl_inner=0x7f06007d; + public static final int download_duration=0x7f060030; + public static final int download_empty=0x7f060033; + public static final int download_equalizer=0x7f0600ae; + public static final int download_jukebox=0x7f0600b0; + public static final int download_list=0x7f060034; + public static final int download_next=0x7f060062; + public static final int download_pause=0x7f060060; + public static final int download_playlist_flipper=0x7f06002a; + public static final int download_position=0x7f06002f; + public static final int download_previous=0x7f06005e; + public static final int download_progress_bar=0x7f060035; + public static final int download_repeat=0x7f060063; + public static final int download_shuffle=0x7f06005d; + public static final int download_song_title=0x7f060029; + public static final int download_star=0x7f060064; + public static final int download_start=0x7f06005f; + public static final int download_status=0x7f060028; + public static final int download_stop=0x7f060061; + public static final int download_toggle_list=0x7f06005c; + public static final int download_visualizer=0x7f0600af; + public static final int download_visualizer_view_layout=0x7f06002d; + public static final int equalizer_bar=0x7f06003b; + public static final int equalizer_frequency=0x7f060039; + public static final int equalizer_level=0x7f06003a; + public static final int equalizer_enabled=0x7f060036; + public static final int equalizer_layout=0x7f060037; + public static final int equalizer_preset=0x7f060038; + public static final int fl_inner=0x7f06007f; public static final int flip=0x7f060008; + public static final int get_playlist_comment=0x7f0600aa; + public static final int get_playlist_comment_label=0x7f0600a9; + public static final int get_playlist_name=0x7f0600a8; + public static final int get_playlist_name_label=0x7f0600a7; + public static final int get_playlist_public=0x7f0600ac; + public static final int get_playlist_public_label=0x7f0600ab; public static final int gridview=0x7f060009; - public static final int help_back=0x7f060046; - public static final int help_buttons=0x7f060045; - public static final int help_contents=0x7f060049; - public static final int help_forward=0x7f060048; - public static final int help_stop=0x7f060047; - public static final int jukebox_volume_progress_bar=0x7f06004b; + public static final int help_back=0x7f06003d; + public static final int help_buttons=0x7f06003c; + public static final int help_contents=0x7f060040; + public static final int help_forward=0x7f06003f; + public static final int help_stop=0x7f06003e; + public static final int jukebox_volume_progress_bar=0x7f060042; public static final int linearLayout1=0x7f060020; - public static final int lyrics_artist=0x7f06004d; - public static final int lyrics_scrollview=0x7f06004c; - public static final int lyrics_text=0x7f06004f; - public static final int lyrics_title=0x7f06004e; - public static final int main_select_server_1=0x7f060053; - public static final int main_select_server_2=0x7f060054; - public static final int main_albums=0x7f06005c; - public static final int main_albums_alphaByArtist=0x7f060064; - public static final int main_albums_alphaByName=0x7f060063; - public static final int main_albums_button=0x7f060057; - public static final int main_albums_frequent=0x7f06005f; - public static final int main_albums_highest=0x7f060060; - public static final int main_albums_newest=0x7f06005d; - public static final int main_albums_random=0x7f060061; - public static final int main_albums_recent=0x7f06005e; - public static final int main_albums_starred=0x7f060062; - public static final int main_artists_button=0x7f060056; - public static final int main_dummy=0x7f060051; - public static final int main_genres_button=0x7f060058; - public static final int main_list=0x7f060050; - public static final int main_music=0x7f060055; - public static final int main_select_server=0x7f060052; - public static final int main_shuffle=0x7f0600a5; - public static final int main_songs=0x7f060059; - public static final int main_songs_button=0x7f06005a; - public static final int main_songs_starred=0x7f06005b; + public static final int lyrics_artist=0x7f060044; + public static final int lyrics_scrollview=0x7f060043; + public static final int lyrics_text=0x7f060046; + public static final int lyrics_title=0x7f060045; + public static final int main_select_server_1=0x7f06004a; + public static final int main_select_server_2=0x7f06004b; + public static final int main_albums=0x7f060053; + public static final int main_albums_alphaByArtist=0x7f06005b; + public static final int main_albums_alphaByName=0x7f06005a; + public static final int main_albums_button=0x7f06004e; + public static final int main_albums_frequent=0x7f060056; + public static final int main_albums_highest=0x7f060057; + public static final int main_albums_newest=0x7f060054; + public static final int main_albums_random=0x7f060058; + public static final int main_albums_recent=0x7f060055; + public static final int main_albums_starred=0x7f060059; + public static final int main_artists_button=0x7f06004d; + public static final int main_dummy=0x7f060048; + public static final int main_genres_button=0x7f06004f; + public static final int main_list=0x7f060047; + public static final int main_music=0x7f06004c; + public static final int main_select_server=0x7f060049; + public static final int main_shuffle=0x7f0600ad; + public static final int main_songs=0x7f060050; + public static final int main_songs_button=0x7f060051; + public static final int main_songs_starred=0x7f060052; public static final int manualOnly=0x7f060004; /** Used with View#setTag(int) to specify a position for the active view. */ @@ -698,85 +705,93 @@ or to a theme attribute in the form "?[package:][type:]na public static final int menu_common=0x7f06006c; public static final int menu_exit=0x7f06006f; public static final int menu_home=0x7f060067; - public static final int menu_lyrics=0x7f0600ad; + public static final int menu_lyrics=0x7f0600b5; public static final int menu_main=0x7f060065; public static final int menu_navigation=0x7f060066; public static final int menu_now_playing=0x7f06006b; public static final int menu_playlists=0x7f06006a; - public static final int menu_remove=0x7f0600ae; - public static final int menu_remove_all=0x7f0600aa; - public static final int menu_save_playlist=0x7f0600a9; - public static final int menu_screen_on_off=0x7f0600ab; + public static final int menu_remove=0x7f0600b6; + public static final int menu_remove_all=0x7f0600b2; + public static final int menu_save_playlist=0x7f0600b1; + public static final int menu_screen_on_off=0x7f0600b3; public static final int menu_search=0x7f060069; public static final int menu_settings=0x7f06006d; - public static final int menu_show_album=0x7f0600ac; - public static final int menu_shuffle=0x7f0600af; + public static final int menu_show_album=0x7f0600b4; + public static final int menu_shuffle=0x7f0600b7; public static final int notification_image=0x7f060071; public static final int now_playing=0x7f060076; - public static final int now_playing_artist=0x7f060079; - public static final int now_playing_control_play=0x7f06007a; - public static final int now_playing_image=0x7f060077; - public static final int now_playing_trackname=0x7f060078; - public static final int play_video_contents=0x7f06007b; - public static final int progress_message=0x7f06007c; + public static final int now_playing_artist=0x7f06007a; + public static final int now_playing_control_play=0x7f06007b; + public static final int now_playing_image=0x7f060078; + public static final int now_playing_trackname=0x7f060079; + public static final int now_playing_view=0x7f060077; + public static final int play_video_contents=0x7f06007c; + public static final int playlist_info=0x7f0600c1; + public static final int playlist_menu_delete=0x7f0600c6; + public static final int playlist_menu_pin=0x7f0600c4; + public static final int playlist_menu_play_now=0x7f0600c2; + public static final int playlist_menu_play_shuffled=0x7f0600c3; + public static final int playlist_name=0x7f06007d; + public static final int playlist_update_info=0x7f0600c5; + public static final int progress_message=0x7f06007e; public static final int pullDownFromTop=0x7f060005; public static final int pullFromEnd=0x7f060002; public static final int pullFromStart=0x7f060001; public static final int pullUpFromBottom=0x7f060006; - public static final int pull_to_refresh_image=0x7f06007e; - public static final int pull_to_refresh_progress=0x7f06007f; - public static final int pull_to_refresh_sub_text=0x7f060081; - public static final int pull_to_refresh_text=0x7f060080; + public static final int pull_to_refresh_image=0x7f060080; + public static final int pull_to_refresh_progress=0x7f060081; + public static final int pull_to_refresh_sub_text=0x7f060083; + public static final int pull_to_refresh_text=0x7f060082; public static final int rotate=0x7f060007; - public static final int save_playlist_name=0x7f060083; - public static final int save_playlist_root=0x7f060082; + public static final int save_playlist_name=0x7f060085; + public static final int save_playlist_root=0x7f060084; public static final int scrollview=0x7f06000b; - public static final int search_albums=0x7f060087; - public static final int search_artists=0x7f060086; - public static final int search_list=0x7f060084; - public static final int search_more_albums=0x7f06008a; - public static final int search_more_artists=0x7f060089; - public static final int search_more_songs=0x7f06008b; - public static final int search_search=0x7f060085; - public static final int search_songs=0x7f060088; - public static final int select_album_art=0x7f06008e; - public static final int select_album_artist=0x7f060090; + public static final int search_albums=0x7f060089; + public static final int search_artists=0x7f060088; + public static final int search_list=0x7f060086; + public static final int search_more_albums=0x7f06008c; + public static final int search_more_artists=0x7f06008b; + public static final int search_more_songs=0x7f06008d; + public static final int search_search=0x7f060087; + public static final int search_songs=0x7f06008a; + public static final int select_album_art=0x7f060090; + public static final int select_album_artist=0x7f060092; public static final int select_album_delete=0x7f060019; - public static final int select_album_duration=0x7f060093; - public static final int select_album_empty=0x7f06008c; - public static final int select_album_entries=0x7f06008d; - public static final int select_album_genre=0x7f060091; + public static final int select_album_duration=0x7f060095; + public static final int select_album_empty=0x7f06008e; + public static final int select_album_entries=0x7f06008f; + public static final int select_album_genre=0x7f060093; public static final int select_album_more=0x7f06001a; public static final int select_album_pin=0x7f060017; - public static final int select_album_play_all=0x7f0600b0; + public static final int select_album_play_all=0x7f0600b8; public static final int select_album_play_last=0x7f060016; public static final int select_album_play_next=0x7f060015; public static final int select_album_play_now=0x7f060014; public static final int select_album_select=0x7f060013; - public static final int select_album_song_count=0x7f060092; - public static final int select_album_title=0x7f06008f; + public static final int select_album_song_count=0x7f060094; + public static final int select_album_title=0x7f060091; public static final int select_album_unpin=0x7f060018; - public static final int select_artist_folder=0x7f060095; - public static final int select_artist_folder_1=0x7f060096; - public static final int select_artist_folder_2=0x7f060097; - public static final int select_artist_list=0x7f060094; - public static final int select_genre_empty=0x7f060098; - public static final int select_genre_list=0x7f060099; - public static final int select_playlist_empty=0x7f06009a; - public static final int select_playlist_list=0x7f06009b; - public static final int song_artist=0x7f0600a0; - public static final int song_check=0x7f06009c; - public static final int song_duration=0x7f0600a1; - public static final int song_star=0x7f0600a2; - public static final int song_status=0x7f06009f; - public static final int song_title=0x7f06009e; - public static final int song_track=0x7f06009d; + public static final int select_artist_folder=0x7f060097; + public static final int select_artist_folder_1=0x7f060098; + public static final int select_artist_folder_2=0x7f060099; + public static final int select_artist_list=0x7f060096; + public static final int select_genre_empty=0x7f06009a; + public static final int select_genre_list=0x7f06009b; + public static final int select_playlist_empty=0x7f06009c; + public static final int select_playlist_list=0x7f06009d; + public static final int song_artist=0x7f0600a2; + public static final int song_check=0x7f06009e; + public static final int song_duration=0x7f0600a3; + public static final int song_star=0x7f0600a4; + public static final int song_status=0x7f0600a1; + public static final int song_title=0x7f0600a0; + public static final int song_track=0x7f06009f; public static final int status_icon=0x7f060072; public static final int statusbar=0x7f060070; - public static final int tab_progress=0x7f0600a3; - public static final int tab_progress_message=0x7f0600a4; + public static final int tab_progress=0x7f0600a5; + public static final int tab_progress_message=0x7f0600a6; public static final int title=0x7f060022; - public static final int toast_layout_root=0x7f06004a; + public static final int toast_layout_root=0x7f060041; public static final int trackname=0x7f060073; public static final int webview=0x7f06000a; } @@ -800,27 +815,29 @@ or to a theme attribute in the form "?[package:][type:]na public static final int lyrics=0x7f03000c; public static final int main=0x7f03000d; public static final int main_buttons=0x7f03000e; - public static final int menu_main=0x7f03000f; - public static final int menu_row_category=0x7f030010; - public static final int menu_row_item=0x7f030011; - public static final int notification=0x7f030012; - public static final int now_playing=0x7f030013; - public static final int play_video=0x7f030014; - public static final int playlist_list_item=0x7f030015; - public static final int progress=0x7f030016; - public static final int pull_to_refresh_header_horizontal=0x7f030017; - public static final int pull_to_refresh_header_vertical=0x7f030018; - public static final int save_playlist=0x7f030019; - public static final int search=0x7f03001a; - public static final int search_buttons=0x7f03001b; - public static final int select_album=0x7f03001c; - public static final int select_album_header=0x7f03001d; - public static final int select_artist=0x7f03001e; - public static final int select_artist_header=0x7f03001f; - public static final int select_genre=0x7f030020; - public static final int select_playlist=0x7f030021; - public static final int song_list_item=0x7f030022; - public static final int tab_progress=0x7f030023; + public static final int media_buttons=0x7f03000f; + public static final int menu_main=0x7f030010; + public static final int menu_row_category=0x7f030011; + public static final int menu_row_item=0x7f030012; + public static final int notification=0x7f030013; + public static final int now_playing=0x7f030014; + public static final int play_video=0x7f030015; + public static final int playlist_list_item=0x7f030016; + public static final int progress=0x7f030017; + public static final int pull_to_refresh_header_horizontal=0x7f030018; + public static final int pull_to_refresh_header_vertical=0x7f030019; + public static final int save_playlist=0x7f03001a; + public static final int search=0x7f03001b; + public static final int search_buttons=0x7f03001c; + public static final int select_album=0x7f03001d; + public static final int select_album_header=0x7f03001e; + public static final int select_artist=0x7f03001f; + public static final int select_artist_header=0x7f030020; + public static final int select_genre=0x7f030021; + public static final int select_playlist=0x7f030022; + public static final int song_list_item=0x7f030023; + public static final int tab_progress=0x7f030024; + public static final int update_playlist=0x7f030025; } public static final class menu { public static final int main=0x7f0e0000; @@ -829,6 +846,8 @@ or to a theme attribute in the form "?[package:][type:]na public static final int select_album=0x7f0e0003; public static final int select_album_context=0x7f0e0004; public static final int select_artist_context=0x7f0e0005; + public static final int select_playlist_context=0x7f0e0006; + public static final int select_playlist_context_offline=0x7f0e0007; } public static final class plurals { public static final int select_album_donate_dialog_n_trial_days_left=0x7f0d0005; @@ -839,117 +858,132 @@ or to a theme attribute in the form "?[package:][type:]na public static final int select_album_n_songs_unpinned=0x7f0d0002; } public static final class string { - public static final int background_task_loading=0x7f080105; - public static final int background_task_network_error=0x7f080107; - public static final int background_task_no_network=0x7f080106; - public static final int background_task_not_found=0x7f080108; - public static final int background_task_parse_error=0x7f080109; - public static final int background_task_wait=0x7f080104; - public static final int button_bar_browse=0x7f080013; - public static final int button_bar_home=0x7f080012; - public static final int button_bar_now_playing=0x7f080016; - public static final int button_bar_playlists=0x7f080015; - public static final int button_bar_search=0x7f080014; + public static final int background_task_loading=0x7f08011e; + public static final int background_task_network_error=0x7f080120; + public static final int background_task_no_network=0x7f08011f; + public static final int background_task_not_found=0x7f080121; + public static final int background_task_parse_error=0x7f080122; + public static final int background_task_wait=0x7f08011d; + public static final int button_bar_browse=0x7f080019; + public static final int button_bar_home=0x7f080018; + public static final int button_bar_now_playing=0x7f08001c; + public static final int button_bar_playlists=0x7f08001b; + public static final int button_bar_search=0x7f08001a; public static final int common_appname=0x7f080006; public static final int common_cancel=0x7f080009; + public static final int common_comment=0x7f080016; + public static final int common_confirm=0x7f080014; public static final int common_delete=0x7f08000f; + public static final int common_info=0x7f080012; public static final int common_multiple_genres=0x7f080011; + public static final int common_name=0x7f080015; public static final int common_ok=0x7f080007; public static final int common_pin=0x7f08000d; public static final int common_play_last=0x7f08000c; public static final int common_play_next=0x7f08000b; public static final int common_play_now=0x7f08000a; + public static final int common_play_shuffled=0x7f080013; + public static final int common_public=0x7f080017; public static final int common_save=0x7f080008; public static final int common_unpin=0x7f08000e; public static final int common_various_artists=0x7f080010; - public static final int download_empty=0x7f08005c; - public static final int download_jukebox_not_authorized=0x7f08007b; - public static final int download_jukebox_off=0x7f080077; - public static final int download_jukebox_offline=0x7f08007a; - public static final int download_jukebox_on=0x7f080076; - public static final int download_jukebox_server_too_old=0x7f080079; - public static final int download_jukebox_volume=0x7f080078; - public static final int download_menu_equalizer=0x7f080068; - public static final int download_menu_jukebox=0x7f08006a; - public static final int download_menu_lyrics=0x7f080061; - public static final int download_menu_remove=0x7f080062; - public static final int download_menu_remove_all=0x7f080063; - public static final int download_menu_save=0x7f080067; - public static final int download_menu_screen_off=0x7f080065; - public static final int download_menu_screen_on=0x7f080064; - public static final int download_menu_show_album=0x7f080060; - public static final int download_menu_shuffle=0x7f080066; - public static final int download_menu_shuffle_notification=0x7f08006b; - public static final int download_menu_visualizer=0x7f080069; - public static final int download_playerstate_buffering=0x7f08005e; - public static final int download_playerstate_downloading=0x7f08005d; - public static final int download_playerstate_playing_shuffle=0x7f08005f; - public static final int download_playlist_done=0x7f08006f; - public static final int download_playlist_error=0x7f080070; - public static final int download_playlist_name=0x7f08006d; - public static final int download_playlist_saving=0x7f08006e; - public static final int download_playlist_title=0x7f08006c; - public static final int download_repeat_all=0x7f080072; - public static final int download_repeat_off=0x7f080071; - public static final int download_repeat_single=0x7f080073; - public static final int download_visualizer_off=0x7f080075; - public static final int download_visualizer_on=0x7f080074; - public static final int equalizer_enabled=0x7f080116; - public static final int equalizer_label=0x7f080115; - public static final int equalizer_preset=0x7f080117; - public static final int error_label=0x7f08007f; - public static final int help_back=0x7f080039; - public static final int help_close=0x7f08003a; - public static final int help_label=0x7f080037; - public static final int help_loading=0x7f08003c; - public static final int help_title=0x7f080038; - public static final int help_url=0x7f08003b; - public static final int lyrics_nomatch=0x7f08007e; - public static final int main_albums_alphaByArtist=0x7f080029; - public static final int main_albums_alphaByName=0x7f080028; - public static final int main_albums_frequent=0x7f080024; - public static final int main_albums_highest=0x7f080025; - public static final int main_albums_newest=0x7f080022; - public static final int main_albums_random=0x7f080026; - public static final int main_albums_recent=0x7f080023; - public static final int main_albums_starred=0x7f080027; - public static final int main_albums_title=0x7f080021; - public static final int main_artists_title=0x7f08001f; - public static final int main_genres_title=0x7f080020; - public static final int main_music=0x7f08002e; - public static final int main_offline=0x7f08001d; - public static final int main_select_all_genres=0x7f08001b; - public static final int main_select_genre=0x7f08001a; - public static final int main_select_server=0x7f080019; - public static final int main_settings=0x7f08001e; - public static final int main_shuffle=0x7f08001c; - public static final int main_songs_genre=0x7f08002d; - public static final int main_songs_random=0x7f08002c; - public static final int main_songs_starred=0x7f08002b; - public static final int main_songs_title=0x7f08002a; - public static final int main_welcome_text=0x7f080018; - public static final int main_welcome_title=0x7f080017; - public static final int menu_about=0x7f080032; - public static final int menu_common=0x7f080035; - public static final int menu_exit=0x7f08002f; - public static final int menu_help=0x7f080031; - public static final int menu_navigation=0x7f080034; - public static final int menu_search=0x7f080033; - public static final int menu_settings=0x7f080030; - public static final int music_library_label=0x7f080048; - public static final int music_library_label_offline=0x7f080049; - public static final int music_service_retry=0x7f080103; - public static final int parser_artist_count=0x7f080111; - public static final int parser_not_authenticated=0x7f08010f; - public static final int parser_not_authorized=0x7f080110; - public static final int parser_reading=0x7f08010b; - public static final int parser_reading_done=0x7f08010c; - public static final int parser_upgrade_client=0x7f08010d; - public static final int parser_upgrade_server=0x7f08010e; - public static final int play_video_loading=0x7f08003d; - public static final int play_video_noplugin=0x7f08003e; - public static final int playlist_label=0x7f080036; - public static final int progress_wait=0x7f080047; + public static final int delete_playlist=0x7f08008d; + public static final int download_empty=0x7f080069; + public static final int download_jukebox_not_authorized=0x7f080088; + public static final int download_jukebox_off=0x7f080084; + public static final int download_jukebox_offline=0x7f080087; + public static final int download_jukebox_on=0x7f080083; + public static final int download_jukebox_server_too_old=0x7f080086; + public static final int download_jukebox_volume=0x7f080085; + public static final int download_menu_equalizer=0x7f080075; + public static final int download_menu_jukebox=0x7f080077; + public static final int download_menu_lyrics=0x7f08006e; + public static final int download_menu_remove=0x7f08006f; + public static final int download_menu_remove_all=0x7f080070; + public static final int download_menu_save=0x7f080074; + public static final int download_menu_screen_off=0x7f080072; + public static final int download_menu_screen_on=0x7f080071; + public static final int download_menu_show_album=0x7f08006d; + public static final int download_menu_shuffle=0x7f080073; + public static final int download_menu_shuffle_notification=0x7f080078; + public static final int download_menu_visualizer=0x7f080076; + public static final int download_playerstate_buffering=0x7f08006b; + public static final int download_playerstate_downloading=0x7f08006a; + public static final int download_playerstate_playing_shuffle=0x7f08006c; + public static final int download_playlist_done=0x7f08007c; + public static final int download_playlist_error=0x7f08007d; + public static final int download_playlist_name=0x7f08007a; + public static final int download_playlist_saving=0x7f08007b; + public static final int download_playlist_title=0x7f080079; + public static final int download_repeat_all=0x7f08007f; + public static final int download_repeat_off=0x7f08007e; + public static final int download_repeat_single=0x7f080080; + public static final int download_visualizer_off=0x7f080082; + public static final int download_visualizer_on=0x7f080081; + public static final int equalizer_enabled=0x7f08012f; + public static final int equalizer_label=0x7f08012e; + public static final int equalizer_preset=0x7f080130; + public static final int error_label=0x7f080091; + public static final int help_back=0x7f080046; + public static final int help_close=0x7f080047; + public static final int help_label=0x7f080044; + public static final int help_loading=0x7f080049; + public static final int help_title=0x7f080045; + public static final int help_url=0x7f080048; + public static final int lyrics_nomatch=0x7f080090; + public static final int main_albums_alphaByArtist=0x7f08002f; + public static final int main_albums_alphaByName=0x7f08002e; + public static final int main_albums_frequent=0x7f08002a; + public static final int main_albums_highest=0x7f08002b; + public static final int main_albums_newest=0x7f080028; + public static final int main_albums_random=0x7f08002c; + public static final int main_albums_recent=0x7f080029; + public static final int main_albums_starred=0x7f08002d; + public static final int main_albums_title=0x7f080027; + public static final int main_artists_title=0x7f080025; + public static final int main_genres_title=0x7f080026; + public static final int main_music=0x7f080034; + public static final int main_offline=0x7f080023; + public static final int main_select_all_genres=0x7f080021; + public static final int main_select_genre=0x7f080020; + public static final int main_select_server=0x7f08001f; + public static final int main_settings=0x7f080024; + public static final int main_shuffle=0x7f080022; + public static final int main_songs_genre=0x7f080033; + public static final int main_songs_random=0x7f080032; + public static final int main_songs_starred=0x7f080031; + public static final int main_songs_title=0x7f080030; + public static final int main_welcome_text=0x7f08001e; + public static final int main_welcome_title=0x7f08001d; + public static final int menu_about=0x7f080038; + public static final int menu_add_playlist=0x7f08003c; + public static final int menu_common=0x7f08003b; + public static final int menu_deleted_playlist=0x7f08003e; + public static final int menu_deleted_playlist_error=0x7f08003f; + public static final int menu_exit=0x7f080035; + public static final int menu_help=0x7f080037; + public static final int menu_navigation=0x7f08003a; + public static final int menu_remove_playlist=0x7f08003d; + public static final int menu_search=0x7f080039; + public static final int menu_settings=0x7f080036; + public static final int music_library_label=0x7f080055; + public static final int music_library_label_offline=0x7f080056; + public static final int music_service_retry=0x7f08011c; + public static final int parser_artist_count=0x7f08012a; + public static final int parser_not_authenticated=0x7f080128; + public static final int parser_not_authorized=0x7f080129; + public static final int parser_reading=0x7f080124; + public static final int parser_reading_done=0x7f080125; + public static final int parser_upgrade_client=0x7f080126; + public static final int parser_upgrade_server=0x7f080127; + public static final int play_video_loading=0x7f08004a; + public static final int play_video_noplugin=0x7f08004b; + public static final int playlist_label=0x7f080040; + public static final int playlist_update_info=0x7f080041; + public static final int playlist_updated_info=0x7f080042; + public static final int playlist_updated_info_error=0x7f080043; + public static final int playlist_error=0x7f080089; + public static final int progress_wait=0x7f080054; /** Just use standard Pull Down String when pulling up. These can be set for languages which require it Just use standard Pull Down String when pulling up. These can be set for languages which require it */ @@ -959,178 +993,188 @@ or to a theme attribute in the form "?[package:][type:]na public static final int pull_to_refresh_pull_label=0x7f080000; public static final int pull_to_refresh_refreshing_label=0x7f080002; public static final int pull_to_refresh_release_label=0x7f080001; - public static final int search_albums=0x7f080044; - public static final int search_artists=0x7f080043; - public static final int search_label=0x7f08003f; - public static final int search_more=0x7f080046; - public static final int search_no_match=0x7f080042; - public static final int search_search=0x7f080041; - public static final int search_songs=0x7f080045; - public static final int search_title=0x7f080040; - public static final int select_album_donate_dialog_0_trial_days_left=0x7f080058; - public static final int select_album_donate_dialog_later=0x7f080057; - public static final int select_album_donate_dialog_message=0x7f080055; - public static final int select_album_donate_dialog_now=0x7f080056; - public static final int select_album_empty=0x7f08004a; - public static final int select_album_more=0x7f08004e; - public static final int select_album_n_selected=0x7f08004c; - public static final int select_album_n_unselected=0x7f08004d; - public static final int select_album_no_network=0x7f080053; - public static final int select_album_no_sdcard=0x7f080052; - public static final int select_album_not_licensed=0x7f080054; - public static final int select_album_offline=0x7f08004f; - public static final int select_album_play_all=0x7f080051; - public static final int select_album_searching=0x7f080050; - public static final int select_album_select=0x7f08004b; - public static final int select_artist_all_folders=0x7f080114; - public static final int select_artist_empty=0x7f080059; - public static final int select_artist_folder=0x7f080113; - public static final int select_artist_refresh=0x7f080112; - public static final int select_genre_empty=0x7f08005a; - public static final int select_playlist_empty=0x7f08005b; - public static final int service_connecting=0x7f08010a; - public static final int settings_appearance_title=0x7f080099; - public static final int settings_buffer_length=0x7f0800d2; - public static final int settings_buffer_length_1=0x7f0800d4; - public static final int settings_buffer_length_10=0x7f0800d8; - public static final int settings_buffer_length_12=0x7f0800d9; - public static final int settings_buffer_length_15=0x7f0800da; - public static final int settings_buffer_length_2=0x7f0800d5; - public static final int settings_buffer_length_20=0x7f0800db; - public static final int settings_buffer_length_30=0x7f0800dc; - public static final int settings_buffer_length_5=0x7f0800d6; - public static final int settings_buffer_length_8=0x7f0800d7; - public static final int settings_cache_location=0x7f080091; - public static final int settings_cache_location_error=0x7f080092; - public static final int settings_cache_size=0x7f080090; - public static final int settings_cache_size_100=0x7f0800b9; - public static final int settings_cache_size_1000=0x7f0800bc; - public static final int settings_cache_size_10000=0x7f0800bf; - public static final int settings_cache_size_200=0x7f0800ba; - public static final int settings_cache_size_2000=0x7f0800bd; - public static final int settings_cache_size_20000=0x7f0800c0; - public static final int settings_cache_size_500=0x7f0800bb; - public static final int settings_cache_size_5000=0x7f0800be; - public static final int settings_cache_size_unlimited=0x7f0800c1; - public static final int settings_cache_title=0x7f08008e; - public static final int settings_clear_search_history=0x7f0800c2; - public static final int settings_connection_failure=0x7f080096; - public static final int settings_default_albums=0x7f080101; - public static final int settings_default_artists=0x7f080100; - public static final int settings_default_songs=0x7f080102; - public static final int settings_display_bitrate=0x7f0800ad; - public static final int settings_display_bitrate_summary=0x7f0800ae; - public static final int settings_hide_media_summary=0x7f0800cc; - public static final int settings_hide_media_title=0x7f0800cb; - public static final int settings_hide_media_toast=0x7f0800cd; - public static final int settings_invalid_url=0x7f080097; - public static final int settings_invalid_username=0x7f080098; - public static final int settings_max_albums=0x7f0800ef; - public static final int settings_max_artists=0x7f0800fe; - public static final int settings_max_bitrate_112=0x7f0800a4; - public static final int settings_max_bitrate_128=0x7f0800a5; - public static final int settings_max_bitrate_160=0x7f0800a6; - public static final int settings_max_bitrate_192=0x7f0800a7; - public static final int settings_max_bitrate_256=0x7f0800a8; - public static final int settings_max_bitrate_32=0x7f0800a0; - public static final int settings_max_bitrate_320=0x7f0800a9; - public static final int settings_max_bitrate_64=0x7f0800a1; - public static final int settings_max_bitrate_80=0x7f0800a2; - public static final int settings_max_bitrate_96=0x7f0800a3; - public static final int settings_max_bitrate_mobile=0x7f08009f; - public static final int settings_max_bitrate_unlimited=0x7f0800aa; - public static final int settings_max_bitrate_wifi=0x7f08009e; - public static final int settings_max_songs=0x7f0800ff; - public static final int settings_media_button_summary=0x7f0800cf; - public static final int settings_media_button_title=0x7f0800ce; - public static final int settings_network_timeout=0x7f0800d3; - public static final int settings_network_timeout_105000=0x7f0800e3; - public static final int settings_network_timeout_120000=0x7f0800e4; - public static final int settings_network_timeout_15000=0x7f0800dd; - public static final int settings_network_timeout_30000=0x7f0800de; - public static final int settings_network_timeout_45000=0x7f0800df; - public static final int settings_network_timeout_60000=0x7f0800e0; - public static final int settings_network_timeout_75000=0x7f0800e1; - public static final int settings_network_timeout_90000=0x7f0800e2; - public static final int settings_network_title=0x7f08009d; - public static final int settings_other_title=0x7f0800c4; - public static final int settings_playback_control_title=0x7f0800c6; - public static final int settings_preload=0x7f08008f; - public static final int settings_preload_1=0x7f0800b3; - public static final int settings_preload_10=0x7f0800b7; - public static final int settings_preload_2=0x7f0800b4; - public static final int settings_preload_3=0x7f0800b5; - public static final int settings_preload_5=0x7f0800b6; - public static final int settings_preload_unlimited=0x7f0800b8; - public static final int settings_screen_lit_summary=0x7f0800d1; - public static final int settings_screen_lit_title=0x7f0800d0; - public static final int settings_scrobble_summary=0x7f0800c8; - public static final int settings_scrobble_title=0x7f0800c7; - public static final int settings_search_1=0x7f0800f0; - public static final int settings_search_10=0x7f0800f3; - public static final int settings_search_100=0x7f0800fb; - public static final int settings_search_15=0x7f0800f4; - public static final int settings_search_20=0x7f0800f5; - public static final int settings_search_25=0x7f0800f6; - public static final int settings_search_250=0x7f0800fc; - public static final int settings_search_3=0x7f0800f1; - public static final int settings_search_30=0x7f0800f7; - public static final int settings_search_40=0x7f0800f8; - public static final int settings_search_5=0x7f0800f2; - public static final int settings_search_50=0x7f0800f9; - public static final int settings_search_500=0x7f0800fd; - public static final int settings_search_75=0x7f0800fa; - public static final int settings_search_history_cleared=0x7f0800c3; - public static final int settings_search_title=0x7f0800c5; - public static final int settings_server_add_server=0x7f080088; - public static final int settings_server_address=0x7f08008b; - public static final int settings_server_name=0x7f080087; - public static final int settings_server_number=0x7f080089; - public static final int settings_server_password=0x7f08008d; - public static final int settings_server_remove_server=0x7f08008a; - public static final int settings_server_scaling_summary=0x7f0800ca; - public static final int settings_server_scaling_title=0x7f0800c9; - public static final int settings_server_unused=0x7f080083; - public static final int settings_server_unused1=0x7f080084; - public static final int settings_server_unused2=0x7f080085; - public static final int settings_server_unused3=0x7f080086; - public static final int settings_server_username=0x7f08008c; - public static final int settings_servers_title=0x7f080082; - public static final int settings_show_lockscreen_controls=0x7f0800e9; - public static final int settings_show_lockscreen_controls_summary=0x7f0800ea; - public static final int settings_show_notification=0x7f0800e5; - public static final int settings_show_notification_always=0x7f0800e7; - public static final int settings_show_notification_always_summary=0x7f0800e8; - public static final int settings_show_notification_summary=0x7f0800e6; - public static final int settings_show_now_playing=0x7f0800ed; - public static final int settings_show_now_playing_summary=0x7f0800ee; - public static final int settings_show_track_number=0x7f0800b1; - public static final int settings_show_track_number_summary=0x7f0800b2; - public static final int settings_test_connection_title=0x7f080081; - public static final int settings_testing_connection=0x7f080093; - public static final int settings_testing_ok=0x7f080094; - public static final int settings_testing_unlicensed=0x7f080095; - public static final int settings_theme_dark=0x7f08009c; - public static final int settings_theme_light=0x7f08009b; - public static final int settings_theme_title=0x7f08009a; - public static final int settings_title=0x7f080080; - public static final int settings_use_folder_for_album_artist=0x7f0800af; - public static final int settings_use_folder_for_album_artist_summary=0x7f0800b0; - public static final int settings_use_stream_proxy=0x7f0800eb; - public static final int settings_use_stream_proxy_summary=0x7f0800ec; - public static final int settings_wifi_required_summary=0x7f0800ac; - public static final int settings_wifi_required_title=0x7f0800ab; - public static final int song_details_all=0x7f08007c; - public static final int song_details_kbps=0x7f08007d; - public static final int util_bytes_format_byte=0x7f08011e; - public static final int util_bytes_format_gigabyte=0x7f08011b; - public static final int util_bytes_format_kilobyte=0x7f08011d; - public static final int util_bytes_format_megabyte=0x7f08011c; - public static final int util_no_time=0x7f08011f; - public static final int util_zero_time=0x7f080120; - public static final int widget_initial_text=0x7f080118; - public static final int widget_sdcard_busy=0x7f080119; - public static final int widget_sdcard_missing=0x7f08011a; + public static final int removed_playlist=0x7f08008c; + public static final int search_albums=0x7f080051; + public static final int search_artists=0x7f080050; + public static final int search_label=0x7f08004c; + public static final int search_more=0x7f080053; + public static final int search_no_match=0x7f08004f; + public static final int search_search=0x7f08004e; + public static final int search_songs=0x7f080052; + public static final int search_title=0x7f08004d; + public static final int select_album_donate_dialog_0_trial_days_left=0x7f080065; + public static final int select_album_donate_dialog_later=0x7f080064; + public static final int select_album_donate_dialog_message=0x7f080062; + public static final int select_album_donate_dialog_now=0x7f080063; + public static final int select_album_empty=0x7f080057; + public static final int select_album_more=0x7f08005b; + public static final int select_album_n_selected=0x7f080059; + public static final int select_album_n_unselected=0x7f08005a; + public static final int select_album_no_network=0x7f080060; + public static final int select_album_no_sdcard=0x7f08005f; + public static final int select_album_not_licensed=0x7f080061; + public static final int select_album_offline=0x7f08005c; + public static final int select_album_play_all=0x7f08005e; + public static final int select_album_searching=0x7f08005d; + public static final int select_album_select=0x7f080058; + public static final int select_artist_all_folders=0x7f08012d; + public static final int select_artist_empty=0x7f080066; + public static final int select_artist_folder=0x7f08012c; + public static final int select_artist_refresh=0x7f08012b; + public static final int select_genre_empty=0x7f080067; + public static final int select_playlist_empty=0x7f080068; + public static final int service_connecting=0x7f080123; + public static final int settings_appearance_title=0x7f0800ab; + public static final int settings_buffer_length=0x7f0800e4; + public static final int settings_buffer_length_1=0x7f0800e6; + public static final int settings_buffer_length_10=0x7f0800ea; + public static final int settings_buffer_length_12=0x7f0800eb; + public static final int settings_buffer_length_15=0x7f0800ec; + public static final int settings_buffer_length_2=0x7f0800e7; + public static final int settings_buffer_length_20=0x7f0800ed; + public static final int settings_buffer_length_30=0x7f0800ee; + public static final int settings_buffer_length_5=0x7f0800e8; + public static final int settings_buffer_length_8=0x7f0800e9; + public static final int settings_cache_location=0x7f0800a3; + public static final int settings_cache_location_error=0x7f0800a4; + public static final int settings_cache_size=0x7f0800a2; + public static final int settings_cache_size_100=0x7f0800cb; + public static final int settings_cache_size_1000=0x7f0800ce; + public static final int settings_cache_size_10000=0x7f0800d1; + public static final int settings_cache_size_200=0x7f0800cc; + public static final int settings_cache_size_2000=0x7f0800cf; + public static final int settings_cache_size_20000=0x7f0800d2; + public static final int settings_cache_size_500=0x7f0800cd; + public static final int settings_cache_size_5000=0x7f0800d0; + public static final int settings_cache_size_unlimited=0x7f0800d3; + public static final int settings_cache_title=0x7f0800a0; + public static final int settings_clear_search_history=0x7f0800d4; + public static final int settings_connection_failure=0x7f0800a8; + public static final int settings_default_albums=0x7f080117; + public static final int settings_default_artists=0x7f080116; + public static final int settings_default_songs=0x7f080118; + public static final int settings_display_bitrate=0x7f0800bf; + public static final int settings_display_bitrate_summary=0x7f0800c0; + public static final int settings_download_transition=0x7f0800ff; + public static final int settings_download_transition_summary=0x7f080100; + public static final int settings_gapless_playback=0x7f080101; + public static final int settings_gapless_playback_summary=0x7f080102; + public static final int settings_hide_media_summary=0x7f0800de; + public static final int settings_hide_media_title=0x7f0800dd; + public static final int settings_hide_media_toast=0x7f0800df; + public static final int settings_invalid_url=0x7f0800a9; + public static final int settings_invalid_username=0x7f0800aa; + public static final int settings_max_albums=0x7f080105; + public static final int settings_max_artists=0x7f080114; + public static final int settings_max_bitrate_112=0x7f0800b6; + public static final int settings_max_bitrate_128=0x7f0800b7; + public static final int settings_max_bitrate_160=0x7f0800b8; + public static final int settings_max_bitrate_192=0x7f0800b9; + public static final int settings_max_bitrate_256=0x7f0800ba; + public static final int settings_max_bitrate_32=0x7f0800b2; + public static final int settings_max_bitrate_320=0x7f0800bb; + public static final int settings_max_bitrate_64=0x7f0800b3; + public static final int settings_max_bitrate_80=0x7f0800b4; + public static final int settings_max_bitrate_96=0x7f0800b5; + public static final int settings_max_bitrate_mobile=0x7f0800b1; + public static final int settings_max_bitrate_unlimited=0x7f0800bc; + public static final int settings_max_bitrate_wifi=0x7f0800b0; + public static final int settings_max_songs=0x7f080115; + public static final int settings_media_button_summary=0x7f0800e1; + public static final int settings_media_button_title=0x7f0800e0; + public static final int settings_network_timeout=0x7f0800e5; + public static final int settings_network_timeout_105000=0x7f0800f5; + public static final int settings_network_timeout_120000=0x7f0800f6; + public static final int settings_network_timeout_15000=0x7f0800ef; + public static final int settings_network_timeout_30000=0x7f0800f0; + public static final int settings_network_timeout_45000=0x7f0800f1; + public static final int settings_network_timeout_60000=0x7f0800f2; + public static final int settings_network_timeout_75000=0x7f0800f3; + public static final int settings_network_timeout_90000=0x7f0800f4; + public static final int settings_network_title=0x7f0800af; + public static final int settings_other_title=0x7f0800d6; + public static final int settings_playback_control_title=0x7f0800d8; + public static final int settings_preload=0x7f0800a1; + public static final int settings_preload_1=0x7f0800c5; + public static final int settings_preload_10=0x7f0800c9; + public static final int settings_preload_2=0x7f0800c6; + public static final int settings_preload_3=0x7f0800c7; + public static final int settings_preload_5=0x7f0800c8; + public static final int settings_preload_unlimited=0x7f0800ca; + public static final int settings_screen_lit_summary=0x7f0800e3; + public static final int settings_screen_lit_title=0x7f0800e2; + public static final int settings_scrobble_summary=0x7f0800da; + public static final int settings_scrobble_title=0x7f0800d9; + public static final int settings_search_1=0x7f080106; + public static final int settings_search_10=0x7f080109; + public static final int settings_search_100=0x7f080111; + public static final int settings_search_15=0x7f08010a; + public static final int settings_search_20=0x7f08010b; + public static final int settings_search_25=0x7f08010c; + public static final int settings_search_250=0x7f080112; + public static final int settings_search_3=0x7f080107; + public static final int settings_search_30=0x7f08010d; + public static final int settings_search_40=0x7f08010e; + public static final int settings_search_5=0x7f080108; + public static final int settings_search_50=0x7f08010f; + public static final int settings_search_500=0x7f080113; + public static final int settings_search_75=0x7f080110; + public static final int settings_search_history_cleared=0x7f0800d5; + public static final int settings_search_title=0x7f0800d7; + public static final int settings_server_add_server=0x7f08009a; + public static final int settings_server_address=0x7f08009d; + public static final int settings_server_name=0x7f080099; + public static final int settings_server_number=0x7f08009b; + public static final int settings_server_password=0x7f08009f; + public static final int settings_server_remove_server=0x7f08009c; + public static final int settings_server_scaling_summary=0x7f0800dc; + public static final int settings_server_scaling_title=0x7f0800db; + public static final int settings_server_unused=0x7f080095; + public static final int settings_server_unused1=0x7f080096; + public static final int settings_server_unused2=0x7f080097; + public static final int settings_server_unused3=0x7f080098; + public static final int settings_server_username=0x7f08009e; + public static final int settings_servers_title=0x7f080094; + public static final int settings_show_lockscreen_controls=0x7f0800fb; + public static final int settings_show_lockscreen_controls_summary=0x7f0800fc; + public static final int settings_show_notification=0x7f0800f7; + public static final int settings_show_notification_always=0x7f0800f9; + public static final int settings_show_notification_always_summary=0x7f0800fa; + public static final int settings_show_notification_summary=0x7f0800f8; + public static final int settings_show_now_playing=0x7f080103; + public static final int settings_show_now_playing_summary=0x7f080104; + public static final int settings_show_track_number=0x7f0800c3; + public static final int settings_show_track_number_summary=0x7f0800c4; + public static final int settings_test_connection_title=0x7f080093; + public static final int settings_testing_connection=0x7f0800a5; + public static final int settings_testing_ok=0x7f0800a6; + public static final int settings_testing_unlicensed=0x7f0800a7; + public static final int settings_theme_dark=0x7f0800ae; + public static final int settings_theme_light=0x7f0800ad; + public static final int settings_theme_title=0x7f0800ac; + public static final int settings_title=0x7f080092; + public static final int settings_use_folder_for_album_artist=0x7f0800c1; + public static final int settings_use_folder_for_album_artist_summary=0x7f0800c2; + public static final int settings_use_stream_proxy=0x7f0800fd; + public static final int settings_use_stream_proxy_summary=0x7f0800fe; + public static final int settings_wifi_required_summary=0x7f0800be; + public static final int settings_wifi_required_title=0x7f0800bd; + public static final int shuffle_endYear=0x7f08011a; + public static final int shuffle_genre=0x7f08011b; + public static final int shuffle_startYear=0x7f080119; + public static final int song_details_all=0x7f08008e; + public static final int song_details_kbps=0x7f08008f; + public static final int updated_playlist=0x7f08008a; + public static final int updated_playlist_error=0x7f08008b; + public static final int util_bytes_format_byte=0x7f080137; + public static final int util_bytes_format_gigabyte=0x7f080134; + public static final int util_bytes_format_kilobyte=0x7f080136; + public static final int util_bytes_format_megabyte=0x7f080135; + public static final int util_no_time=0x7f080138; + public static final int util_zero_time=0x7f080139; + public static final int widget_initial_text=0x7f080131; + public static final int widget_sdcard_busy=0x7f080132; + public static final int widget_sdcard_missing=0x7f080133; } public static final class style { public static final int MenuDrawer=0x7f0a0005; diff --git a/res/drawable/drop_shadow.xml b/res/drawable/drop_shadow.xml new file mode 100644 index 00000000..19d83b51 --- /dev/null +++ b/res/drawable/drop_shadow.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/res/layout-land/download.xml b/res/layout-land/download.xml index 289eed64..0c9d5cae 100644 --- a/res/layout-land/download.xml +++ b/res/layout-land/download.xml @@ -26,88 +26,7 @@ a:paddingBottom="12dip" a:paddingTop="12dip" > - - - - - - - - - - - - - - - - - + diff --git a/res/layout-port/download.xml b/res/layout-port/download.xml index 0782dbac..ccc0dd9a 100644 --- a/res/layout-port/download.xml +++ b/res/layout-port/download.xml @@ -64,99 +64,8 @@ - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/res/layout/album_buttons.xml b/res/layout/album_buttons.xml index 040fae13..ebe3b4aa 100644 --- a/res/layout/album_buttons.xml +++ b/res/layout/album_buttons.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:padding="10dp" > + android:padding="6dp" > + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:padding="16dip"> + android:id="@+id/equalizer_enabled" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/equalizer.enabled" + android:textColor="#c0c0c0" + android:textAppearance="?android:attr/textAppearanceMedium"/> + android:layout_width="fill_parent" + android:layout_height="wrap_content"> + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="wrap_content"> + android:id="@+id/equalizer_layout" + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="wrap_content"/>