diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7bff45d2..fd7542dd 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ + a:versionCode="3" + a:versionName="1.0.0.27" a:installLocation="auto"> diff --git a/gen/com/thejoshwa/ultrasonic/androidapp/R.java b/gen/com/thejoshwa/ultrasonic/androidapp/R.java index 60b92b0d..818db4cb 100644 --- a/gen/com/thejoshwa/ultrasonic/androidapp/R.java +++ b/gen/com/thejoshwa/ultrasonic/androidapp/R.java @@ -59,33 +59,33 @@ public final class R { public static final int btn_check_buttonless_off=0x7f020007; public static final int btn_check_buttonless_on=0x7f020008; public static final int btn_check_custom=0x7f020009; - public static final int btn_collapse_group_normal_holo_dark=0x7f02000a; - public static final int buttonbar_selector=0x7f02000b; - public static final int ic_appwidget_music_next=0x7f02000c; - public static final int ic_appwidget_music_pause=0x7f02000d; - public static final int ic_appwidget_music_play=0x7f02000e; - public static final int ic_appwidget_music_previous=0x7f02000f; - public static final int ic_launcher=0x7f020010; - public static final int ic_menu_browse=0x7f020011; - public static final int ic_menu_exit=0x7f020012; - public static final int ic_menu_help=0x7f020013; - public static final int ic_menu_home=0x7f020014; - public static final int ic_menu_moreoverflow=0x7f020015; - public static final int ic_menu_play_all=0x7f020016; - public static final int ic_menu_playlists=0x7f020017; - public static final int ic_menu_refresh=0x7f020018; - public static final int ic_menu_remove_all=0x7f020019; - public static final int ic_menu_save=0x7f02001a; - public static final int ic_menu_screen_on_off=0x7f02001b; - public static final int ic_menu_search=0x7f02001c; - public static final int ic_menu_select_artist_folder=0x7f02001d; - public static final int ic_menu_settings=0x7f02001e; - public static final int ic_menu_share=0x7f02001f; - public static final int ic_menu_shuffle=0x7f020020; - public static final int ic_stat_downloaded=0x7f020021; - public static final int ic_stat_downloading=0x7f020022; - public static final int ic_stat_play=0x7f020023; - public static final int ic_stat_saved=0x7f020024; + public static final int buttonbar_selector=0x7f02000a; + public static final int ic_appwidget_music_next=0x7f02000b; + public static final int ic_appwidget_music_pause=0x7f02000c; + public static final int ic_appwidget_music_play=0x7f02000d; + public static final int ic_appwidget_music_previous=0x7f02000e; + public static final int ic_launcher=0x7f02000f; + public static final int ic_menu_browse=0x7f020010; + public static final int ic_menu_exit=0x7f020011; + public static final int ic_menu_help=0x7f020012; + public static final int ic_menu_home=0x7f020013; + public static final int ic_menu_moreoverflow=0x7f020014; + public static final int ic_menu_play_all=0x7f020015; + public static final int ic_menu_playlists=0x7f020016; + public static final int ic_menu_refresh=0x7f020017; + public static final int ic_menu_remove_all=0x7f020018; + public static final int ic_menu_save=0x7f020019; + public static final int ic_menu_screen_on_off=0x7f02001a; + public static final int ic_menu_search=0x7f02001b; + public static final int ic_menu_select_artist_folder=0x7f02001c; + public static final int ic_menu_settings=0x7f02001d; + public static final int ic_menu_share=0x7f02001e; + public static final int ic_menu_shuffle=0x7f02001f; + public static final int ic_star_full=0x7f020020; + public static final int ic_star_hollow=0x7f020021; + public static final int ic_stat_downloaded=0x7f020022; + public static final int ic_stat_downloading=0x7f020023; + public static final int ic_stat_play=0x7f020024; public static final int ic_stat_ultrasonic=0x7f020025; public static final int list_background=0x7f020026; public static final int list_focused_holo=0x7f020027; @@ -123,34 +123,26 @@ public final class R { public static final int select_album_play_all=0x7f020047; public static final int select_album_play_all_normal=0x7f020048; public static final int select_album_play_all_pressed=0x7f020049; - public static final int slider_knob=0x7f02004a; - public static final int star=0x7f02004b; - public static final int star_hollow=0x7f02004c; - public static final int status_bg=0x7f02004d; - public static final int status_next=0x7f02004e; - public static final int status_pause=0x7f02004f; - public static final int status_play=0x7f020050; - public static final int status_prev=0x7f020051; - public static final int status_stop=0x7f020052; - public static final int title_bar_shadow=0x7f020053; - public static final int unknown_album=0x7f020054; - public static final int unknown_album_large=0x7f020055; + public static final int status_bg=0x7f02004a; + public static final int title_bar_shadow=0x7f02004b; + public static final int unknown_album=0x7f02004c; + public static final int unknown_album_large=0x7f02004d; } public static final class id { - public static final int album=0x7f0d004f; + public static final int album=0x7f0d0050; public static final int album_artist=0x7f0d0002; public static final int album_coverart=0x7f0d0000; - public static final int album_menu_pin=0x7f0d0091; - public static final int album_menu_play_last=0x7f0d0090; - public static final int album_menu_play_now=0x7f0d008f; + public static final int album_menu_pin=0x7f0d008d; + public static final int album_menu_play_last=0x7f0d008c; + public static final int album_menu_play_now=0x7f0d008b; public static final int album_star=0x7f0d0003; public static final int album_title=0x7f0d0001; public static final int appwidget_coverart=0x7f0d0004; public static final int appwidget_top=0x7f0d0006; public static final int artist=0x7f0d0008; - public static final int artist_menu_pin=0x7f0d0094; - public static final int artist_menu_play_last=0x7f0d0093; - public static final int artist_menu_play_now=0x7f0d0092; + public static final int artist_menu_pin=0x7f0d0090; + public static final int artist_menu_play_last=0x7f0d008f; + public static final int artist_menu_play_now=0x7f0d008e; public static final int button_bar=0x7f0d000c; public static final int button_bar_home=0x7f0d000d; public static final int button_bar_music=0x7f0d000e; @@ -162,134 +154,130 @@ public final class R { public static final int control_next=0x7f0d000b; public static final int control_play=0x7f0d000a; public static final int control_previous=0x7f0d0009; - public static final int control_stop=0x7f0d0050; - public static final int download_album=0x7f0d0027; - public static final int download_album_art_image=0x7f0d0021; - public static final int download_album_art_layout=0x7f0d0020; - public static final int download_artist=0x7f0d0026; - public static final int download_button_bar_flipper=0x7f0d0023; + public static final int control_stop=0x7f0d0051; + public static final int download_album=0x7f0d0028; + public static final int download_album_art_image=0x7f0d0022; + public static final int download_album_art_layout=0x7f0d0021; + public static final int download_artist=0x7f0d0027; + public static final int download_button_bar_flipper=0x7f0d0024; public static final int download_control_layout=0x7f0d0014; - public static final int download_duration=0x7f0d0025; - public static final int download_empty=0x7f0d0028; - public static final int download_equalizer=0x7f0d0084; - public static final int download_jukebox=0x7f0d0086; - public static final int download_list=0x7f0d0029; + public static final int download_duration=0x7f0d0026; + public static final int download_empty=0x7f0d0029; + public static final int download_equalizer=0x7f0d0080; + public static final int download_jukebox=0x7f0d0082; + public static final int download_list=0x7f0d002a; public static final int download_next=0x7f0d001a; public static final int download_pause=0x7f0d0017; - public static final int download_playlist_flipper=0x7f0d001f; - public static final int download_position=0x7f0d0024; + public static final int download_playlist_flipper=0x7f0d0020; + public static final int download_position=0x7f0d0025; public static final int download_previous=0x7f0d0016; - public static final int download_progress_bar=0x7f0d002a; + public static final int download_progress_bar=0x7f0d002b; public static final int download_repeat=0x7f0d001b; public static final int download_shuffle=0x7f0d0015; - public static final int download_song_title=0x7f0d001e; + public static final int download_song_title=0x7f0d001f; + public static final int download_star=0x7f0d001c; public static final int download_start=0x7f0d0019; - public static final int download_status=0x7f0d001d; + public static final int download_status=0x7f0d001e; public static final int download_stop=0x7f0d0018; - public static final int download_toggle_list=0x7f0d001c; - public static final int download_visualizer=0x7f0d0085; - public static final int download_visualizer_view_layout=0x7f0d0022; - public static final int equalizer_bar=0x7f0d0030; - public static final int equalizer_frequency=0x7f0d002e; - public static final int equalizer_level=0x7f0d002f; - public static final int equalizer_enabled=0x7f0d002b; - public static final int equalizer_layout=0x7f0d002c; - public static final int equalizer_preset=0x7f0d002d; - public static final int help_back=0x7f0d0032; - public static final int help_buttons=0x7f0d0031; - public static final int help_close=0x7f0d0033; - public static final int help_contents=0x7f0d0034; - public static final int icon=0x7f0d0079; - public static final int jukebox_volume_progress_bar=0x7f0d0036; + public static final int download_toggle_list=0x7f0d001d; + public static final int download_visualizer=0x7f0d0081; + public static final int download_visualizer_view_layout=0x7f0d0023; + public static final int equalizer_bar=0x7f0d0031; + public static final int equalizer_frequency=0x7f0d002f; + public static final int equalizer_level=0x7f0d0030; + public static final int equalizer_enabled=0x7f0d002c; + public static final int equalizer_layout=0x7f0d002d; + public static final int equalizer_preset=0x7f0d002e; + public static final int help_back=0x7f0d0033; + public static final int help_buttons=0x7f0d0032; + public static final int help_close=0x7f0d0034; + public static final int help_contents=0x7f0d0035; + public static final int jukebox_volume_progress_bar=0x7f0d0037; public static final int linearLayout1=0x7f0d0005; - public static final int lyrics_artist=0x7f0d0038; - public static final int lyrics_scrollview=0x7f0d0037; - public static final int lyrics_text=0x7f0d003a; - public static final int lyrics_title=0x7f0d0039; - public static final int main_select_server_1=0x7f0d003e; - public static final int main_select_server_2=0x7f0d003f; - public static final int main_albums=0x7f0d0042; - public static final int main_albums_alphaByArtist=0x7f0d004a; - public static final int main_albums_alphaByName=0x7f0d0049; - public static final int main_albums_frequent=0x7f0d0045; - public static final int main_albums_highest=0x7f0d0046; - public static final int main_albums_newest=0x7f0d0043; - public static final int main_albums_random=0x7f0d0047; - public static final int main_albums_recent=0x7f0d0044; - public static final int main_albums_starred=0x7f0d0048; - public static final int main_dummy=0x7f0d003c; - public static final int main_list=0x7f0d003b; - public static final int main_select_server=0x7f0d003d; - public static final int main_shuffle=0x7f0d0083; - public static final int main_songs=0x7f0d0040; - public static final int main_songs_starred=0x7f0d0041; - public static final int menu_exit=0x7f0d0082; - public static final int menu_help=0x7f0d0081; - public static final int menu_lyrics=0x7f0d008b; - public static final int menu_refresh=0x7f0d0095; - public static final int menu_remove=0x7f0d008c; - public static final int menu_remove_all=0x7f0d0088; - public static final int menu_save_playlist=0x7f0d0087; - public static final int menu_screen_on_off=0x7f0d0089; - public static final int menu_settings=0x7f0d0080; - public static final int menu_show_album=0x7f0d008a; - public static final int menu_shuffle=0x7f0d008d; - public static final int notification_image=0x7f0d004c; - public static final int play_video_contents=0x7f0d0051; - public static final int progress_message=0x7f0d0052; - public static final int save_playlist_name=0x7f0d0054; - public static final int save_playlist_root=0x7f0d0053; - public static final int search_albums=0x7f0d0058; - public static final int search_artists=0x7f0d0057; - public static final int search_list=0x7f0d0055; - public static final int search_more_albums=0x7f0d005b; - public static final int search_more_artists=0x7f0d005a; - public static final int search_more_songs=0x7f0d005c; - public static final int search_search=0x7f0d0056; - public static final int search_songs=0x7f0d0059; - public static final int select_album_art=0x7f0d0066; - public static final int select_album_artist=0x7f0d0068; - public static final int select_album_delete=0x7f0d0064; - public static final int select_album_duration=0x7f0d006b; - public static final int select_album_empty=0x7f0d005d; - public static final int select_album_entries=0x7f0d005e; - public static final int select_album_genre=0x7f0d0069; - public static final int select_album_more=0x7f0d0065; - public static final int select_album_pin=0x7f0d0062; - public static final int select_album_play_all=0x7f0d008e; - public static final int select_album_play_last=0x7f0d0061; - public static final int select_album_play_now=0x7f0d0060; - public static final int select_album_select=0x7f0d005f; - public static final int select_album_song_count=0x7f0d006a; - public static final int select_album_title=0x7f0d0067; - public static final int select_album_unpin=0x7f0d0063; - public static final int select_artist_folder=0x7f0d006d; - public static final int select_artist_folder_1=0x7f0d006e; - public static final int select_artist_folder_2=0x7f0d006f; - public static final int select_artist_list=0x7f0d006c; - public static final int select_playlist_empty=0x7f0d0070; - public static final int select_playlist_list=0x7f0d0071; - public static final int song_artist=0x7f0d0076; - public static final int song_check=0x7f0d0072; - public static final int song_duration=0x7f0d0077; - public static final int song_menu_play_last=0x7f0d0098; - public static final int song_menu_play_next=0x7f0d0097; - public static final int song_menu_play_now=0x7f0d0096; - public static final int song_star=0x7f0d0078; - public static final int song_status=0x7f0d0075; - public static final int song_title=0x7f0d0074; - public static final int song_track=0x7f0d0073; - public static final int status_icon=0x7f0d004d; - public static final int status_media_collapse=0x7f0d007d; - public static final int status_media_next=0x7f0d007c; - public static final int status_media_play=0x7f0d007b; - public static final int status_media_prev=0x7f0d007a; - public static final int statusbar=0x7f0d004b; - public static final int tab_progress=0x7f0d007e; - public static final int tab_progress_message=0x7f0d007f; + public static final int lyrics_artist=0x7f0d0039; + public static final int lyrics_scrollview=0x7f0d0038; + public static final int lyrics_text=0x7f0d003b; + public static final int lyrics_title=0x7f0d003a; + public static final int main_select_server_1=0x7f0d003f; + public static final int main_select_server_2=0x7f0d0040; + public static final int main_albums=0x7f0d0043; + public static final int main_albums_alphaByArtist=0x7f0d004b; + public static final int main_albums_alphaByName=0x7f0d004a; + public static final int main_albums_frequent=0x7f0d0046; + public static final int main_albums_highest=0x7f0d0047; + public static final int main_albums_newest=0x7f0d0044; + public static final int main_albums_random=0x7f0d0048; + public static final int main_albums_recent=0x7f0d0045; + public static final int main_albums_starred=0x7f0d0049; + public static final int main_dummy=0x7f0d003d; + public static final int main_list=0x7f0d003c; + public static final int main_select_server=0x7f0d003e; + public static final int main_shuffle=0x7f0d007f; + public static final int main_songs=0x7f0d0041; + public static final int main_songs_starred=0x7f0d0042; + public static final int menu_exit=0x7f0d007e; + public static final int menu_help=0x7f0d007d; + public static final int menu_lyrics=0x7f0d0087; + public static final int menu_refresh=0x7f0d0091; + public static final int menu_remove=0x7f0d0088; + public static final int menu_remove_all=0x7f0d0084; + public static final int menu_save_playlist=0x7f0d0083; + public static final int menu_screen_on_off=0x7f0d0085; + public static final int menu_settings=0x7f0d007c; + public static final int menu_show_album=0x7f0d0086; + public static final int menu_shuffle=0x7f0d0089; + public static final int notification_image=0x7f0d004d; + public static final int play_video_contents=0x7f0d0052; + public static final int progress_message=0x7f0d0053; + public static final int save_playlist_name=0x7f0d0055; + public static final int save_playlist_root=0x7f0d0054; + public static final int search_albums=0x7f0d0059; + public static final int search_artists=0x7f0d0058; + public static final int search_list=0x7f0d0056; + public static final int search_more_albums=0x7f0d005c; + public static final int search_more_artists=0x7f0d005b; + public static final int search_more_songs=0x7f0d005d; + public static final int search_search=0x7f0d0057; + public static final int search_songs=0x7f0d005a; + public static final int select_album_art=0x7f0d0067; + public static final int select_album_artist=0x7f0d0069; + public static final int select_album_delete=0x7f0d0065; + public static final int select_album_duration=0x7f0d006c; + public static final int select_album_empty=0x7f0d005e; + public static final int select_album_entries=0x7f0d005f; + public static final int select_album_genre=0x7f0d006a; + public static final int select_album_more=0x7f0d0066; + public static final int select_album_pin=0x7f0d0063; + public static final int select_album_play_all=0x7f0d008a; + public static final int select_album_play_last=0x7f0d0062; + public static final int select_album_play_now=0x7f0d0061; + public static final int select_album_select=0x7f0d0060; + public static final int select_album_song_count=0x7f0d006b; + public static final int select_album_title=0x7f0d0068; + public static final int select_album_unpin=0x7f0d0064; + public static final int select_artist_folder=0x7f0d006e; + public static final int select_artist_folder_1=0x7f0d006f; + public static final int select_artist_folder_2=0x7f0d0070; + public static final int select_artist_list=0x7f0d006d; + public static final int select_playlist_empty=0x7f0d0071; + public static final int select_playlist_list=0x7f0d0072; + public static final int song_artist=0x7f0d0077; + public static final int song_check=0x7f0d0073; + public static final int song_duration=0x7f0d0078; + public static final int song_menu_play_last=0x7f0d0094; + public static final int song_menu_play_next=0x7f0d0093; + public static final int song_menu_play_now=0x7f0d0092; + public static final int song_star=0x7f0d0079; + public static final int song_status=0x7f0d0076; + public static final int song_title=0x7f0d0075; + public static final int song_track=0x7f0d0074; + public static final int status_icon=0x7f0d004e; + public static final int statusbar=0x7f0d004c; + public static final int tab_progress=0x7f0d007a; + public static final int tab_progress_message=0x7f0d007b; public static final int title=0x7f0d0007; - public static final int toast_layout_root=0x7f0d0035; - public static final int trackname=0x7f0d004e; + public static final int toast_layout_root=0x7f0d0036; + public static final int trackname=0x7f0d004f; } public static final class integer { public static final int config_activityDefaultDur=0x7f080001; @@ -325,8 +313,7 @@ public final class R { public static final int select_artist_header=0x7f03001a; public static final int select_playlist=0x7f03001b; public static final int song_list_item=0x7f03001c; - public static final int statusbar=0x7f03001d; - public static final int tab_progress=0x7f03001e; + public static final int tab_progress=0x7f03001d; } public static final class menu { public static final int common=0x7f0c0000; @@ -346,12 +333,12 @@ public final class R { public static final int select_album_n_songs_downloading=0x7f0a0001; } public static final class string { - public static final int background_task_loading=0x7f0900ed; - public static final int background_task_network_error=0x7f0900ef; - public static final int background_task_no_network=0x7f0900ee; - public static final int background_task_not_found=0x7f0900f0; - public static final int background_task_parse_error=0x7f0900f1; - public static final int background_task_wait=0x7f0900ec; + public static final int background_task_loading=0x7f0900ef; + public static final int background_task_network_error=0x7f0900f1; + public static final int background_task_no_network=0x7f0900f0; + public static final int background_task_not_found=0x7f0900f2; + public static final int background_task_parse_error=0x7f0900f3; + public static final int background_task_wait=0x7f0900ee; public static final int button_bar_browse=0x7f09000d; public static final int button_bar_home=0x7f09000c; public static final int button_bar_now_playing=0x7f090010; @@ -401,9 +388,9 @@ public final class R { public static final int download_repeat_single=0x7f090061; public static final int download_visualizer_off=0x7f090063; public static final int download_visualizer_on=0x7f090062; - public static final int equalizer_enabled=0x7f0900fe; - public static final int equalizer_label=0x7f0900fd; - public static final int equalizer_preset=0x7f0900ff; + public static final int equalizer_enabled=0x7f090100; + public static final int equalizer_label=0x7f0900ff; + public static final int equalizer_preset=0x7f090101; public static final int error_label=0x7f09006d; public static final int help_back=0x7f090029; public static final int help_close=0x7f09002a; @@ -435,14 +422,14 @@ public final class R { public static final int menu_settings=0x7f090023; public static final int music_library_label=0x7f090038; public static final int music_library_label_offline=0x7f090039; - public static final int music_service_retry=0x7f0900eb; - public static final int parser_artist_count=0x7f0900f9; - public static final int parser_not_authenticated=0x7f0900f7; - public static final int parser_not_authorized=0x7f0900f8; - public static final int parser_reading=0x7f0900f3; - public static final int parser_reading_done=0x7f0900f4; - public static final int parser_upgrade_client=0x7f0900f5; - public static final int parser_upgrade_server=0x7f0900f6; + public static final int music_service_retry=0x7f0900ed; + public static final int parser_artist_count=0x7f0900fb; + public static final int parser_not_authenticated=0x7f0900f9; + public static final int parser_not_authorized=0x7f0900fa; + public static final int parser_reading=0x7f0900f5; + public static final int parser_reading_done=0x7f0900f6; + public static final int parser_upgrade_client=0x7f0900f7; + public static final int parser_upgrade_server=0x7f0900f8; public static final int play_video_loading=0x7f09002d; public static final int play_video_noplugin=0x7f09002e; public static final int playlist_label=0x7f090026; @@ -470,49 +457,49 @@ public final class R { public static final int select_album_play_all=0x7f090041; public static final int select_album_searching=0x7f090040; public static final int select_album_select=0x7f09003b; - public static final int select_artist_all_folders=0x7f0900fc; - public static final int select_artist_folder=0x7f0900fb; - public static final int select_artist_refresh=0x7f0900fa; + public static final int select_artist_all_folders=0x7f0900fe; + public static final int select_artist_folder=0x7f0900fd; + public static final int select_artist_refresh=0x7f0900fc; public static final int select_playlist_empty=0x7f090049; - public static final int service_connecting=0x7f0900f2; + public static final int service_connecting=0x7f0900f4; public static final int settings_appearance_title=0x7f090083; - public static final int settings_buffer_length=0x7f0900bc; - public static final int settings_buffer_length_1=0x7f0900be; - public static final int settings_buffer_length_10=0x7f0900c2; - public static final int settings_buffer_length_12=0x7f0900c3; - public static final int settings_buffer_length_15=0x7f0900c4; - public static final int settings_buffer_length_2=0x7f0900bf; - public static final int settings_buffer_length_20=0x7f0900c5; - public static final int settings_buffer_length_30=0x7f0900c6; - public static final int settings_buffer_length_5=0x7f0900c0; - public static final int settings_buffer_length_8=0x7f0900c1; + public static final int settings_buffer_length=0x7f0900be; + public static final int settings_buffer_length_1=0x7f0900c0; + public static final int settings_buffer_length_10=0x7f0900c4; + public static final int settings_buffer_length_12=0x7f0900c5; + public static final int settings_buffer_length_15=0x7f0900c6; + public static final int settings_buffer_length_2=0x7f0900c1; + public static final int settings_buffer_length_20=0x7f0900c7; + public static final int settings_buffer_length_30=0x7f0900c8; + public static final int settings_buffer_length_5=0x7f0900c2; + public static final int settings_buffer_length_8=0x7f0900c3; public static final int settings_cache_location=0x7f09007b; public static final int settings_cache_location_error=0x7f09007c; public static final int settings_cache_size=0x7f09007a; - public static final int settings_cache_size_100=0x7f0900a3; - public static final int settings_cache_size_1000=0x7f0900a6; - public static final int settings_cache_size_10000=0x7f0900a9; - public static final int settings_cache_size_200=0x7f0900a4; - public static final int settings_cache_size_2000=0x7f0900a7; - public static final int settings_cache_size_20000=0x7f0900aa; - public static final int settings_cache_size_500=0x7f0900a5; - public static final int settings_cache_size_5000=0x7f0900a8; - public static final int settings_cache_size_unlimited=0x7f0900ab; + public static final int settings_cache_size_100=0x7f0900a5; + public static final int settings_cache_size_1000=0x7f0900a8; + public static final int settings_cache_size_10000=0x7f0900ab; + public static final int settings_cache_size_200=0x7f0900a6; + public static final int settings_cache_size_2000=0x7f0900a9; + public static final int settings_cache_size_20000=0x7f0900ac; + public static final int settings_cache_size_500=0x7f0900a7; + public static final int settings_cache_size_5000=0x7f0900aa; + public static final int settings_cache_size_unlimited=0x7f0900ad; public static final int settings_cache_title=0x7f090078; - public static final int settings_clear_search_history=0x7f0900ac; + public static final int settings_clear_search_history=0x7f0900ae; public static final int settings_connection_failure=0x7f090080; - public static final int settings_default_albums=0x7f0900e9; - public static final int settings_default_artists=0x7f0900e8; - public static final int settings_default_songs=0x7f0900ea; + public static final int settings_default_albums=0x7f0900eb; + public static final int settings_default_artists=0x7f0900ea; + public static final int settings_default_songs=0x7f0900ec; public static final int settings_display_bitrate=0x7f090099; public static final int settings_display_bitrate_summary=0x7f09009a; - public static final int settings_hide_media_summary=0x7f0900b6; - public static final int settings_hide_media_title=0x7f0900b5; - public static final int settings_hide_media_toast=0x7f0900b7; + public static final int settings_hide_media_summary=0x7f0900b8; + public static final int settings_hide_media_title=0x7f0900b7; + public static final int settings_hide_media_toast=0x7f0900b9; public static final int settings_invalid_url=0x7f090081; public static final int settings_invalid_username=0x7f090082; - public static final int settings_max_albums=0x7f0900d7; - public static final int settings_max_artists=0x7f0900e6; + public static final int settings_max_albums=0x7f0900d9; + public static final int settings_max_artists=0x7f0900e8; public static final int settings_max_bitrate_112=0x7f090090; public static final int settings_max_bitrate_128=0x7f090091; public static final int settings_max_bitrate_160=0x7f090092; @@ -526,64 +513,66 @@ public final class R { public static final int settings_max_bitrate_mobile=0x7f09008b; public static final int settings_max_bitrate_unlimited=0x7f090096; public static final int settings_max_bitrate_wifi=0x7f09008a; - public static final int settings_max_songs=0x7f0900e7; - public static final int settings_media_button_summary=0x7f0900b9; - public static final int settings_media_button_title=0x7f0900b8; - public static final int settings_network_timeout=0x7f0900bd; - public static final int settings_network_timeout_105000=0x7f0900cd; - public static final int settings_network_timeout_120000=0x7f0900ce; - public static final int settings_network_timeout_15000=0x7f0900c7; - public static final int settings_network_timeout_30000=0x7f0900c8; - public static final int settings_network_timeout_45000=0x7f0900c9; - public static final int settings_network_timeout_60000=0x7f0900ca; - public static final int settings_network_timeout_75000=0x7f0900cb; - public static final int settings_network_timeout_90000=0x7f0900cc; + public static final int settings_max_songs=0x7f0900e9; + public static final int settings_media_button_summary=0x7f0900bb; + public static final int settings_media_button_title=0x7f0900ba; + public static final int settings_network_timeout=0x7f0900bf; + public static final int settings_network_timeout_105000=0x7f0900cf; + public static final int settings_network_timeout_120000=0x7f0900d0; + public static final int settings_network_timeout_15000=0x7f0900c9; + public static final int settings_network_timeout_30000=0x7f0900ca; + public static final int settings_network_timeout_45000=0x7f0900cb; + public static final int settings_network_timeout_60000=0x7f0900cc; + public static final int settings_network_timeout_75000=0x7f0900cd; + public static final int settings_network_timeout_90000=0x7f0900ce; public static final int settings_network_title=0x7f090089; - public static final int settings_other_title=0x7f0900ae; - public static final int settings_playback_control_title=0x7f0900b0; + public static final int settings_other_title=0x7f0900b0; + public static final int settings_playback_control_title=0x7f0900b2; public static final int settings_preload=0x7f090079; - public static final int settings_preload_1=0x7f09009d; - public static final int settings_preload_10=0x7f0900a1; - public static final int settings_preload_2=0x7f09009e; - public static final int settings_preload_3=0x7f09009f; - public static final int settings_preload_5=0x7f0900a0; - public static final int settings_preload_unlimited=0x7f0900a2; - public static final int settings_screen_lit_summary=0x7f0900bb; - public static final int settings_screen_lit_title=0x7f0900ba; - public static final int settings_scrobble_summary=0x7f0900b2; - public static final int settings_scrobble_title=0x7f0900b1; - public static final int settings_search_1=0x7f0900d8; - public static final int settings_search_10=0x7f0900db; - public static final int settings_search_100=0x7f0900e3; - public static final int settings_search_15=0x7f0900dc; - public static final int settings_search_20=0x7f0900dd; - public static final int settings_search_25=0x7f0900de; - public static final int settings_search_250=0x7f0900e4; - public static final int settings_search_3=0x7f0900d9; - public static final int settings_search_30=0x7f0900df; - public static final int settings_search_40=0x7f0900e0; - public static final int settings_search_5=0x7f0900da; - public static final int settings_search_50=0x7f0900e1; - public static final int settings_search_500=0x7f0900e5; - public static final int settings_search_75=0x7f0900e2; - public static final int settings_search_history_cleared=0x7f0900ad; - public static final int settings_search_title=0x7f0900af; + public static final int settings_preload_1=0x7f09009f; + public static final int settings_preload_10=0x7f0900a3; + public static final int settings_preload_2=0x7f0900a0; + public static final int settings_preload_3=0x7f0900a1; + public static final int settings_preload_5=0x7f0900a2; + public static final int settings_preload_unlimited=0x7f0900a4; + public static final int settings_screen_lit_summary=0x7f0900bd; + public static final int settings_screen_lit_title=0x7f0900bc; + public static final int settings_scrobble_summary=0x7f0900b4; + public static final int settings_scrobble_title=0x7f0900b3; + public static final int settings_search_1=0x7f0900da; + public static final int settings_search_10=0x7f0900dd; + public static final int settings_search_100=0x7f0900e5; + public static final int settings_search_15=0x7f0900de; + public static final int settings_search_20=0x7f0900df; + public static final int settings_search_25=0x7f0900e0; + public static final int settings_search_250=0x7f0900e6; + public static final int settings_search_3=0x7f0900db; + public static final int settings_search_30=0x7f0900e1; + public static final int settings_search_40=0x7f0900e2; + public static final int settings_search_5=0x7f0900dc; + public static final int settings_search_50=0x7f0900e3; + public static final int settings_search_500=0x7f0900e7; + public static final int settings_search_75=0x7f0900e4; + public static final int settings_search_history_cleared=0x7f0900af; + public static final int settings_search_title=0x7f0900b1; public static final int settings_server_address=0x7f090075; public static final int settings_server_name=0x7f090074; public static final int settings_server_password=0x7f090077; - public static final int settings_server_scaling_summary=0x7f0900b4; - public static final int settings_server_scaling_title=0x7f0900b3; + public static final int settings_server_scaling_summary=0x7f0900b6; + public static final int settings_server_scaling_title=0x7f0900b5; public static final int settings_server_unused1=0x7f090071; public static final int settings_server_unused2=0x7f090072; public static final int settings_server_unused3=0x7f090073; public static final int settings_server_username=0x7f090076; public static final int settings_servers_title=0x7f090070; - public static final int settings_show_lockscreen_controls=0x7f0900d3; - public static final int settings_show_lockscreen_controls_summary=0x7f0900d4; - public static final int settings_show_notification=0x7f0900cf; - public static final int settings_show_notification_always=0x7f0900d1; - public static final int settings_show_notification_always_summary=0x7f0900d2; - public static final int settings_show_notification_summary=0x7f0900d0; + public static final int settings_show_lockscreen_controls=0x7f0900d5; + public static final int settings_show_lockscreen_controls_summary=0x7f0900d6; + public static final int settings_show_notification=0x7f0900d1; + public static final int settings_show_notification_always=0x7f0900d3; + public static final int settings_show_notification_always_summary=0x7f0900d4; + public static final int settings_show_notification_summary=0x7f0900d2; + public static final int settings_show_track_number=0x7f09009d; + public static final int settings_show_track_number_summary=0x7f09009e; public static final int settings_test_connection_title=0x7f09006f; public static final int settings_testing_connection=0x7f09007d; public static final int settings_testing_ok=0x7f09007e; @@ -596,19 +585,19 @@ public final class R { public static final int settings_title=0x7f09006e; public static final int settings_use_folder_for_album_artist=0x7f09009b; public static final int settings_use_folder_for_album_artist_summary=0x7f09009c; - public static final int settings_use_stream_proxy=0x7f0900d5; - public static final int settings_use_stream_proxy_summary=0x7f0900d6; + public static final int settings_use_stream_proxy=0x7f0900d7; + public static final int settings_use_stream_proxy_summary=0x7f0900d8; public static final int settings_wifi_required_summary=0x7f090098; public static final int settings_wifi_required_title=0x7f090097; public static final int song_details_all=0x7f09006a; public static final int song_details_kbps=0x7f09006b; - public static final int util_bytes_format_byte=0x7f090106; - public static final int util_bytes_format_gigabyte=0x7f090103; - public static final int util_bytes_format_kilobyte=0x7f090105; - public static final int util_bytes_format_megabyte=0x7f090104; - public static final int widget_initial_text=0x7f090100; - public static final int widget_sdcard_busy=0x7f090101; - public static final int widget_sdcard_missing=0x7f090102; + public static final int util_bytes_format_byte=0x7f090108; + public static final int util_bytes_format_gigabyte=0x7f090105; + public static final int util_bytes_format_kilobyte=0x7f090107; + public static final int util_bytes_format_megabyte=0x7f090106; + public static final int widget_initial_text=0x7f090102; + public static final int widget_sdcard_busy=0x7f090103; + public static final int widget_sdcard_missing=0x7f090104; } public static final class style { public static final int Dark=0x7f0b0000; diff --git a/res/drawable-hdpi/btn_collapse_group_normal_holo_dark.png b/res/drawable-hdpi/btn_collapse_group_normal_holo_dark.png deleted file mode 100644 index 848ce0d1..00000000 Binary files a/res/drawable-hdpi/btn_collapse_group_normal_holo_dark.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_appwidget_music_next.png b/res/drawable-hdpi/ic_appwidget_music_next.png index f5740809..738aae1a 100644 Binary files a/res/drawable-hdpi/ic_appwidget_music_next.png and b/res/drawable-hdpi/ic_appwidget_music_next.png differ diff --git a/res/drawable-hdpi/ic_appwidget_music_pause.png b/res/drawable-hdpi/ic_appwidget_music_pause.png index 42d359f6..6b435bb0 100644 Binary files a/res/drawable-hdpi/ic_appwidget_music_pause.png and b/res/drawable-hdpi/ic_appwidget_music_pause.png differ diff --git a/res/drawable-hdpi/ic_appwidget_music_play.png b/res/drawable-hdpi/ic_appwidget_music_play.png index 67f49247..df8a2ca2 100644 Binary files a/res/drawable-hdpi/ic_appwidget_music_play.png and b/res/drawable-hdpi/ic_appwidget_music_play.png differ diff --git a/res/drawable-hdpi/ic_appwidget_music_previous.png b/res/drawable-hdpi/ic_appwidget_music_previous.png index cead76a1..ba6c5ad9 100644 Binary files a/res/drawable-hdpi/ic_appwidget_music_previous.png and b/res/drawable-hdpi/ic_appwidget_music_previous.png differ diff --git a/res/drawable-hdpi/ic_menu_moreoverflow.png b/res/drawable-hdpi/ic_menu_moreoverflow.png index cb6ebdaf..18bc4c5e 100644 Binary files a/res/drawable-hdpi/ic_menu_moreoverflow.png and b/res/drawable-hdpi/ic_menu_moreoverflow.png differ diff --git a/res/drawable-hdpi/ic_menu_screen_on_off.png b/res/drawable-hdpi/ic_menu_screen_on_off.png index c7168563..64ad2ed5 100644 Binary files a/res/drawable-hdpi/ic_menu_screen_on_off.png and b/res/drawable-hdpi/ic_menu_screen_on_off.png differ diff --git a/res/drawable-hdpi/ic_menu_select_artist_folder.png b/res/drawable-hdpi/ic_menu_select_artist_folder.png index c2cefead..1676b104 100644 Binary files a/res/drawable-hdpi/ic_menu_select_artist_folder.png and b/res/drawable-hdpi/ic_menu_select_artist_folder.png differ diff --git a/res/drawable-hdpi/ic_menu_share.png b/res/drawable-hdpi/ic_menu_share.png index c329f58d..55d9023c 100644 Binary files a/res/drawable-hdpi/ic_menu_share.png and b/res/drawable-hdpi/ic_menu_share.png differ diff --git a/res/drawable-hdpi/star.png b/res/drawable-hdpi/ic_star_full.png similarity index 100% rename from res/drawable-hdpi/star.png rename to res/drawable-hdpi/ic_star_full.png diff --git a/res/drawable-hdpi/star_hollow.png b/res/drawable-hdpi/ic_star_hollow.png similarity index 100% rename from res/drawable-hdpi/star_hollow.png rename to res/drawable-hdpi/ic_star_hollow.png diff --git a/res/drawable-hdpi/ic_stat_downloading.png b/res/drawable-hdpi/ic_stat_downloading.png index 44db2a6b..741e27d5 100644 Binary files a/res/drawable-hdpi/ic_stat_downloading.png and b/res/drawable-hdpi/ic_stat_downloading.png differ diff --git a/res/drawable-hdpi/ic_stat_play.png b/res/drawable-hdpi/ic_stat_play.png index 31e5d368..6a40cd5f 100644 Binary files a/res/drawable-hdpi/ic_stat_play.png and b/res/drawable-hdpi/ic_stat_play.png differ diff --git a/res/drawable-hdpi/media_backward_normal.png b/res/drawable-hdpi/media_backward_normal.png index bded5137..ba6c5ad9 100644 Binary files a/res/drawable-hdpi/media_backward_normal.png and b/res/drawable-hdpi/media_backward_normal.png differ diff --git a/res/drawable-hdpi/media_forward_normal.png b/res/drawable-hdpi/media_forward_normal.png index 2bb004da..738aae1a 100644 Binary files a/res/drawable-hdpi/media_forward_normal.png and b/res/drawable-hdpi/media_forward_normal.png differ diff --git a/res/drawable-hdpi/media_pause_normal.png b/res/drawable-hdpi/media_pause_normal.png index 9f623eab..6b435bb0 100644 Binary files a/res/drawable-hdpi/media_pause_normal.png and b/res/drawable-hdpi/media_pause_normal.png differ diff --git a/res/drawable-hdpi/media_repeat_all.png b/res/drawable-hdpi/media_repeat_all.png index 6c2a6ff6..742fbc28 100644 Binary files a/res/drawable-hdpi/media_repeat_all.png and b/res/drawable-hdpi/media_repeat_all.png differ diff --git a/res/drawable-hdpi/media_repeat_off.png b/res/drawable-hdpi/media_repeat_off.png index daf966eb..fd84738d 100644 Binary files a/res/drawable-hdpi/media_repeat_off.png and b/res/drawable-hdpi/media_repeat_off.png differ diff --git a/res/drawable-hdpi/media_repeat_single.png b/res/drawable-hdpi/media_repeat_single.png index 971bdce2..c27464be 100644 Binary files a/res/drawable-hdpi/media_repeat_single.png and b/res/drawable-hdpi/media_repeat_single.png differ diff --git a/res/drawable-hdpi/media_shuffle_normal.png b/res/drawable-hdpi/media_shuffle_normal.png index 44784e3d..3f20af53 100644 Binary files a/res/drawable-hdpi/media_shuffle_normal.png and b/res/drawable-hdpi/media_shuffle_normal.png differ diff --git a/res/drawable-hdpi/media_start_normal.png b/res/drawable-hdpi/media_start_normal.png index 19641d8c..df8a2ca2 100644 Binary files a/res/drawable-hdpi/media_start_normal.png and b/res/drawable-hdpi/media_start_normal.png differ diff --git a/res/drawable-hdpi/media_stop_normal.png b/res/drawable-hdpi/media_stop_normal.png index ad89af65..dd5d6a1c 100644 Binary files a/res/drawable-hdpi/media_stop_normal.png and b/res/drawable-hdpi/media_stop_normal.png differ diff --git a/res/drawable-hdpi/media_toggle_list_normal.png b/res/drawable-hdpi/media_toggle_list_normal.png index 61e408d5..a8caee87 100644 Binary files a/res/drawable-hdpi/media_toggle_list_normal.png and b/res/drawable-hdpi/media_toggle_list_normal.png differ diff --git a/res/drawable-hdpi/slider_knob.png b/res/drawable-hdpi/slider_knob.png deleted file mode 100644 index 90e9c9c9..00000000 Binary files a/res/drawable-hdpi/slider_knob.png and /dev/null differ diff --git a/res/drawable-hdpi/status_next.png b/res/drawable-hdpi/status_next.png deleted file mode 100644 index 5835f654..00000000 Binary files a/res/drawable-hdpi/status_next.png and /dev/null differ diff --git a/res/drawable-hdpi/status_pause.png b/res/drawable-hdpi/status_pause.png deleted file mode 100644 index 3324f88f..00000000 Binary files a/res/drawable-hdpi/status_pause.png and /dev/null differ diff --git a/res/drawable-hdpi/status_play.png b/res/drawable-hdpi/status_play.png deleted file mode 100644 index 8c95b6a5..00000000 Binary files a/res/drawable-hdpi/status_play.png and /dev/null differ diff --git a/res/drawable-hdpi/status_prev.png b/res/drawable-hdpi/status_prev.png deleted file mode 100644 index 73fb16f2..00000000 Binary files a/res/drawable-hdpi/status_prev.png and /dev/null differ diff --git a/res/drawable-hdpi/status_stop.png b/res/drawable-hdpi/status_stop.png deleted file mode 100644 index ab98e188..00000000 Binary files a/res/drawable-hdpi/status_stop.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_browse.png b/res/drawable-xhdpi/ic_menu_browse.png new file mode 100644 index 00000000..78500a93 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_browse.png differ diff --git a/res/drawable-xhdpi/ic_menu_exit.png b/res/drawable-xhdpi/ic_menu_exit.png new file mode 100644 index 00000000..f391760e Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_exit.png differ diff --git a/res/drawable-xhdpi/ic_menu_help.png b/res/drawable-xhdpi/ic_menu_help.png new file mode 100644 index 00000000..24370486 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_help.png differ diff --git a/res/drawable-xhdpi/ic_menu_home.png b/res/drawable-xhdpi/ic_menu_home.png new file mode 100644 index 00000000..4b4355c4 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_home.png differ diff --git a/res/drawable-hdpi/media_start_pressed.png b/res/drawable-xhdpi/ic_menu_moreoverflow.png similarity index 78% rename from res/drawable-hdpi/media_start_pressed.png rename to res/drawable-xhdpi/ic_menu_moreoverflow.png index 35ba70fa..799c35ca 100644 Binary files a/res/drawable-hdpi/media_start_pressed.png and b/res/drawable-xhdpi/ic_menu_moreoverflow.png differ diff --git a/res/drawable-xhdpi/ic_menu_playlists.png b/res/drawable-xhdpi/ic_menu_playlists.png new file mode 100644 index 00000000..95708234 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_playlists.png differ diff --git a/res/drawable-hdpi/ic_stat_saved.png b/res/drawable-xhdpi/ic_menu_refresh.png similarity index 69% rename from res/drawable-hdpi/ic_stat_saved.png rename to res/drawable-xhdpi/ic_menu_refresh.png index d947e2e1..a7fdc0df 100644 Binary files a/res/drawable-hdpi/ic_stat_saved.png and b/res/drawable-xhdpi/ic_menu_refresh.png differ diff --git a/res/drawable-xhdpi/ic_menu_remove_all.png b/res/drawable-xhdpi/ic_menu_remove_all.png new file mode 100644 index 00000000..412b3335 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_remove_all.png differ diff --git a/res/drawable-xhdpi/ic_menu_save.png b/res/drawable-xhdpi/ic_menu_save.png new file mode 100644 index 00000000..27206025 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_save.png differ diff --git a/res/drawable-xhdpi/ic_menu_screen_on_off.png b/res/drawable-xhdpi/ic_menu_screen_on_off.png new file mode 100644 index 00000000..2e46eb06 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_screen_on_off.png differ diff --git a/res/drawable-xhdpi/ic_menu_search.png b/res/drawable-xhdpi/ic_menu_search.png new file mode 100644 index 00000000..3549f84d Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_search.png differ diff --git a/res/drawable-xhdpi/ic_menu_select_artist_folder.png b/res/drawable-xhdpi/ic_menu_select_artist_folder.png new file mode 100644 index 00000000..38c7b20d Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_select_artist_folder.png differ diff --git a/res/drawable-xhdpi/ic_menu_settings.png b/res/drawable-xhdpi/ic_menu_settings.png new file mode 100644 index 00000000..09b01483 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_settings.png differ diff --git a/res/drawable-xhdpi/ic_menu_share.png b/res/drawable-xhdpi/ic_menu_share.png new file mode 100644 index 00000000..15549b04 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_share.png differ diff --git a/res/drawable-xhdpi/ic_star_full.png b/res/drawable-xhdpi/ic_star_full.png new file mode 100644 index 00000000..7576cc1e Binary files /dev/null and b/res/drawable-xhdpi/ic_star_full.png differ diff --git a/res/drawable-xhdpi/ic_star_hollow.png b/res/drawable-xhdpi/ic_star_hollow.png new file mode 100644 index 00000000..3c618a12 Binary files /dev/null and b/res/drawable-xhdpi/ic_star_hollow.png differ diff --git a/res/drawable-xhdpi/ic_stat_downloaded.png b/res/drawable-xhdpi/ic_stat_downloaded.png new file mode 100644 index 00000000..bc0ced50 Binary files /dev/null and b/res/drawable-xhdpi/ic_stat_downloaded.png differ diff --git a/res/drawable-xhdpi/ic_stat_downloading.png b/res/drawable-xhdpi/ic_stat_downloading.png new file mode 100644 index 00000000..acb2fec1 Binary files /dev/null and b/res/drawable-xhdpi/ic_stat_downloading.png differ diff --git a/res/drawable-xhdpi/media_backward_normal.png b/res/drawable-xhdpi/media_backward_normal.png index bded5137..5be8b460 100644 Binary files a/res/drawable-xhdpi/media_backward_normal.png and b/res/drawable-xhdpi/media_backward_normal.png differ diff --git a/res/drawable-xhdpi/media_forward_normal.png b/res/drawable-xhdpi/media_forward_normal.png index 2bb004da..fe6b5588 100644 Binary files a/res/drawable-xhdpi/media_forward_normal.png and b/res/drawable-xhdpi/media_forward_normal.png differ diff --git a/res/drawable-xhdpi/media_pause_normal.png b/res/drawable-xhdpi/media_pause_normal.png index 9f623eab..333c1b24 100644 Binary files a/res/drawable-xhdpi/media_pause_normal.png and b/res/drawable-xhdpi/media_pause_normal.png differ diff --git a/res/drawable-xhdpi/media_repeat_all.png b/res/drawable-xhdpi/media_repeat_all.png index 6c2a6ff6..1ac8614a 100644 Binary files a/res/drawable-xhdpi/media_repeat_all.png and b/res/drawable-xhdpi/media_repeat_all.png differ diff --git a/res/drawable-xhdpi/media_repeat_off.png b/res/drawable-xhdpi/media_repeat_off.png index daf966eb..b72f10dc 100644 Binary files a/res/drawable-xhdpi/media_repeat_off.png and b/res/drawable-xhdpi/media_repeat_off.png differ diff --git a/res/drawable-xhdpi/media_repeat_single.png b/res/drawable-xhdpi/media_repeat_single.png index 971bdce2..82065b33 100644 Binary files a/res/drawable-xhdpi/media_repeat_single.png and b/res/drawable-xhdpi/media_repeat_single.png differ diff --git a/res/drawable-xhdpi/media_shuffle_normal.png b/res/drawable-xhdpi/media_shuffle_normal.png index 44784e3d..b5cae4fe 100644 Binary files a/res/drawable-xhdpi/media_shuffle_normal.png and b/res/drawable-xhdpi/media_shuffle_normal.png differ diff --git a/res/drawable-xhdpi/media_start_normal.png b/res/drawable-xhdpi/media_start_normal.png index 19641d8c..51124993 100644 Binary files a/res/drawable-xhdpi/media_start_normal.png and b/res/drawable-xhdpi/media_start_normal.png differ diff --git a/res/drawable-xhdpi/media_stop_normal.png b/res/drawable-xhdpi/media_stop_normal.png index ad89af65..ee5eda25 100644 Binary files a/res/drawable-xhdpi/media_stop_normal.png and b/res/drawable-xhdpi/media_stop_normal.png differ diff --git a/res/drawable-xhdpi/media_toggle_list_normal.png b/res/drawable-xhdpi/media_toggle_list_normal.png index 61e408d5..8e69829b 100644 Binary files a/res/drawable-xhdpi/media_toggle_list_normal.png and b/res/drawable-xhdpi/media_toggle_list_normal.png differ diff --git a/res/layout-land/download.xml b/res/layout-land/download.xml index 45253c1f..3d7ae146 100644 --- a/res/layout-land/download.xml +++ b/res/layout-land/download.xml @@ -1,106 +1,182 @@ + a:layout_width="fill_parent" + a:layout_height="fill_parent" + a:orientation="vertical" > - + - + - + - + - + - + - + - + - + - + - - + - + + - + - + + - + - + - + - - + + - + + + - + - + - - - - - + \ No newline at end of file diff --git a/res/layout-port/download.xml b/res/layout-port/download.xml index cfc7e094..e3c26969 100644 --- a/res/layout-port/download.xml +++ b/res/layout-port/download.xml @@ -1,95 +1,168 @@ + a:layout_width="fill_parent" + a:layout_height="fill_parent" + a:orientation="vertical" > - + - + - + - + - + - + + - + + - + - + - + - + - + - + - + - + - + - + + - - + - - - - - + + \ No newline at end of file diff --git a/res/layout/album_list_item.xml b/res/layout/album_list_item.xml index 30ac08ec..ef0d780b 100644 --- a/res/layout/album_list_item.xml +++ b/res/layout/album_list_item.xml @@ -11,8 +11,7 @@ a:layout_width="wrap_content" a:layout_height="wrap_content" a:layout_gravity="left|center_vertical" - a:paddingTop="1dip" - a:paddingBottom="1dip"/> + a:paddingLeft="3dip"/> + a:src="@drawable/ic_star_hollow" + a:focusable="false" + a:paddingRight="3dip" /> diff --git a/res/layout/artist_list_item.xml b/res/layout/artist_list_item.xml index 6ea5b536..2891750e 100644 --- a/res/layout/artist_list_item.xml +++ b/res/layout/artist_list_item.xml @@ -6,6 +6,6 @@ a:layout_height="wrap_content" a:textAppearance="?android:attr/textAppearanceMedium" a:gravity="center_vertical" - a:paddingLeft="2dip" - a:paddingRight="2dip" + a:paddingLeft="3dip" + a:paddingRight="3dip" a:minHeight="50dip"/> \ No newline at end of file diff --git a/res/layout/notification.xml b/res/layout/notification.xml index a72de124..25338a05 100644 --- a/res/layout/notification.xml +++ b/res/layout/notification.xml @@ -74,7 +74,7 @@ android:layout_marginTop="2dip" android:layout_weight="0.0" android:background="@drawable/btn_bg" - android:src="@drawable/status_prev" /> + android:src="@drawable/media_backward_normal" /> + android:src="@drawable/media_pause_normal" /> + android:src="@drawable/media_stop_normal" /> + android:src="@drawable/media_forward_normal" /> diff --git a/res/layout/song_list_item.xml b/res/layout/song_list_item.xml index 2444485b..f49583f8 100644 --- a/res/layout/song_list_item.xml +++ b/res/layout/song_list_item.xml @@ -11,7 +11,7 @@ a:layout_height="fill_parent" a:checkMark="@drawable/btn_check_custom" a:gravity="center_vertical" - a:paddingLeft="0dip" /> + a:paddingLeft="1dip" /> + a:textAppearance="?android:attr/textAppearanceSmall" + a:paddingLeft="4dip" /> + a:src="@drawable/ic_star_hollow" /> \ No newline at end of file diff --git a/res/layout/statusbar.xml b/res/layout/statusbar.xml deleted file mode 100644 index 4b12f6ff..00000000 --- a/res/layout/statusbar.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index e7cf0e2a..b6a183f5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -157,6 +157,8 @@ Append artist name with bitrate and file suffix Use Folders For Artist Name Assume top-level folder is the name of the album artist + Show Track Number + Include track number when displaying a song 1 song 2 songs 3 songs diff --git a/res/xml/settings.xml b/res/xml/settings.xml index 128bdf77..e8f8713a 100644 --- a/res/xml/settings.xml +++ b/res/xml/settings.xml @@ -84,17 +84,26 @@ a:key="theme" a:title="@string/settings.theme_title" /> + - - + - = expectedFileSize) { - Log.i(TAG, "Buffering complete: " + partialFile + " (" + size + "/" + expectedFileSize + ")"); - return true; - } - - Log.i(TAG, "Buffering incomplete: " + partialFile + " (" + size + "/" + expectedFileSize + ")"); return false; } + private boolean bufferComplete() { + if (!getIsCompleteFileAvailable(downloadFile)) { + long size = partialFile.length(); + if (size >= expectedFileSize) { + Log.i(TAG, "Buffering complete: " + partialFile + " (" + + size + "/" + expectedFileSize + ")"); + return true; + } + + Log.i(TAG, "Buffering incomplete: " + partialFile + " (" + size + + "/" + expectedFileSize + ")"); + return false; + } else { + return true; + } + } + @Override public String toString() { return "BufferTask (" + downloadFile + ")"; diff --git a/src/com/thejoshwa/ultrasonic/androidapp/util/AlbumView.java b/src/com/thejoshwa/ultrasonic/androidapp/util/AlbumView.java index f7709f69..4600262d 100644 --- a/src/com/thejoshwa/ultrasonic/androidapp/util/AlbumView.java +++ b/src/com/thejoshwa/ultrasonic/androidapp/util/AlbumView.java @@ -57,7 +57,7 @@ public class AlbumView extends LinearLayout { titleView.setText(album.getTitle()); artistView.setText(album.getArtist()); artistView.setVisibility(album.getArtist() == null ? View.GONE : View.VISIBLE); - starImageView.setImageDrawable(album.getStarred() ? getResources().getDrawable(R.drawable.star) : getResources().getDrawable(R.drawable.star_hollow)); + starImageView.setImageDrawable(album.getStarred() ? getResources().getDrawable(R.drawable.ic_star_full) : getResources().getDrawable(R.drawable.ic_star_hollow)); imageLoader.loadImage(coverArtView, album, false, true); if (Util.isOffline(getContext())) { @@ -71,10 +71,10 @@ public class AlbumView extends LinearLayout { final String id = album.getId(); if (!isStarred) { - starImageView.setImageDrawable(getResources().getDrawable(R.drawable.star)); + starImageView.setImageDrawable(getResources().getDrawable(R.drawable.ic_star_full)); album.setStarred(true); } else { - starImageView.setImageDrawable(getResources().getDrawable(R.drawable.star_hollow)); + starImageView.setImageDrawable(getResources().getDrawable(R.drawable.ic_star_hollow)); album.setStarred(false); } diff --git a/src/com/thejoshwa/ultrasonic/androidapp/util/Constants.java b/src/com/thejoshwa/ultrasonic/androidapp/util/Constants.java index 39ef2f09..72401863 100644 --- a/src/com/thejoshwa/ultrasonic/androidapp/util/Constants.java +++ b/src/com/thejoshwa/ultrasonic/androidapp/util/Constants.java @@ -66,6 +66,7 @@ public final class Constants { public static final String PREFERENCES_KEY_THEME = "theme"; public static final String PREFERENCES_KEY_DISPLAY_BITRATE_WITH_ARTIST = "displayBitrateWithArtist"; public static final String PREFERENCES_KEY_USE_FOLDER_FOR_ALBUM_ARTIST = "useFolderForAlbumArtist"; + public static final String PREFERENCES_KEY_SHOW_TRACK_NUMBER = "showTrackNumber"; public static final String PREFERENCES_KEY_MAX_BITRATE_WIFI = "maxBitrateWifi"; public static final String PREFERENCES_KEY_MAX_BITRATE_MOBILE = "maxBitrateMobile"; public static final String PREFERENCES_KEY_CACHE_SIZE = "cacheSize"; diff --git a/src/com/thejoshwa/ultrasonic/androidapp/util/SongView.java b/src/com/thejoshwa/ultrasonic/androidapp/util/SongView.java index 319be729..48045a15 100644 --- a/src/com/thejoshwa/ultrasonic/androidapp/util/SongView.java +++ b/src/com/thejoshwa/ultrasonic/androidapp/util/SongView.java @@ -108,7 +108,7 @@ public class SongView extends LinearLayout implements Checkable { int trackNumber = song.getTrack(); - if (trackNumber != 0) { + if (Util.shouldShowTrackNumber(getContext()) && trackNumber != 0) { trackTextView.setText(String.format("%02d.", trackNumber)); } else { trackTextView.setVisibility(View.GONE); @@ -117,7 +117,7 @@ public class SongView extends LinearLayout implements Checkable { titleTextView.setText(song.getTitle()); artistTextView.setText(artist); durationTextView.setText(Util.formatDuration(song.getDuration())); - starImageView.setImageDrawable(song.getStarred() ? getResources().getDrawable(R.drawable.star) : getResources().getDrawable(R.drawable.star_hollow)); + starImageView.setImageDrawable(song.getStarred() ? getResources().getDrawable(R.drawable.ic_star_full) : getResources().getDrawable(R.drawable.ic_star_hollow)); checkedTextView.setVisibility(checkable && !song.isVideo() ? View.VISIBLE : View.GONE); if (Util.isOffline(getContext())) { @@ -131,10 +131,10 @@ public class SongView extends LinearLayout implements Checkable { final String id = song.getId(); if (!isStarred) { - starImageView.setImageDrawable(getResources().getDrawable(R.drawable.star)); + starImageView.setImageDrawable(getResources().getDrawable(R.drawable.ic_star_full)); song.setStarred(true); } else { - starImageView.setImageDrawable(getResources().getDrawable(R.drawable.star_hollow)); + starImageView.setImageDrawable(getResources().getDrawable(R.drawable.ic_star_hollow)); song.setStarred(false); } @@ -173,7 +173,7 @@ public class SongView extends LinearLayout implements Checkable { int rightImage = 0; if (completeFile.exists()) { - leftImage = downloadFile.isSaved() ? R.drawable.ic_stat_saved : R.drawable.ic_stat_downloaded; + leftImage = downloadFile.isSaved() ? R.drawable.ic_menu_save : R.drawable.ic_stat_downloaded; } if (downloadFile.isDownloading() && !downloadFile.isDownloadCancelled() && partialFile.exists()) { @@ -185,9 +185,9 @@ public class SongView extends LinearLayout implements Checkable { statusTextView.setCompoundDrawablesWithIntrinsicBounds(leftImage, 0, rightImage, 0); if (!song.getStarred()) { - starImageView.setImageDrawable(getResources().getDrawable(R.drawable.star_hollow)); + starImageView.setImageDrawable(getResources().getDrawable(R.drawable.ic_star_hollow)); } else { - starImageView.setImageDrawable(getResources().getDrawable(R.drawable.star)); + starImageView.setImageDrawable(getResources().getDrawable(R.drawable.ic_star_full)); } boolean playing = downloadService.getCurrentPlaying() == downloadFile; diff --git a/src/com/thejoshwa/ultrasonic/androidapp/util/Util.java b/src/com/thejoshwa/ultrasonic/androidapp/util/Util.java index fec29223..8a4c8586 100644 --- a/src/com/thejoshwa/ultrasonic/androidapp/util/Util.java +++ b/src/com/thejoshwa/ultrasonic/androidapp/util/Util.java @@ -590,6 +590,11 @@ public class Util extends DownloadActivity { return prefs.getBoolean(Constants.PREFERENCES_KEY_USE_FOLDER_FOR_ALBUM_ARTIST, false); } + public static boolean shouldShowTrackNumber(Context context) { + SharedPreferences prefs = getPreferences(context); + return prefs.getBoolean(Constants.PREFERENCES_KEY_SHOW_TRACK_NUMBER, false); + } + public static void info(Context context, int titleId, int messageId) { showDialog(context, android.R.drawable.ic_dialog_info, titleId, messageId); }