Lockscreen improvements, buffer tweaks
This commit is contained in:
Joshua Bahnsen
parent
90b48522b1
commit
f3c9221d67
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
package="net.sourceforge.subsonic.androidapp"
|
||||
a:versionCode="62"
|
||||
a:versionName="3.9.9.21" a:installLocation="auto">
|
||||
a:versionCode="63"
|
||||
a:versionName="3.9.9.22" a:installLocation="auto">
|
||||
|
||||
<uses-permission a:name="android.permission.INTERNET"/>
|
||||
<uses-permission a:name="android.permission.READ_PHONE_STATE"/>
|
||||
|
|
@ -97,7 +97,7 @@
|
|||
</service>
|
||||
|
||||
<receiver a:name="net.sourceforge.subsonic.androidapp.receiver.MediaButtonIntentReceiver">
|
||||
<intent-filter a:priority="999">
|
||||
<intent-filter a:priority="2147483647">
|
||||
<action a:name="android.intent.action.MEDIA_BUTTON" />
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
|
|
|
|||
|
|
@ -349,12 +349,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=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 background_task_loading=0x7f0900f0;
|
||||
public static final int background_task_network_error=0x7f0900f2;
|
||||
public static final int background_task_no_network=0x7f0900f1;
|
||||
public static final int background_task_not_found=0x7f0900f3;
|
||||
public static final int background_task_parse_error=0x7f0900f4;
|
||||
public static final int background_task_wait=0x7f0900ef;
|
||||
public static final int button_bar_browse=0x7f09000b;
|
||||
public static final int button_bar_home=0x7f09000a;
|
||||
public static final int button_bar_now_playing=0x7f09000e;
|
||||
|
|
@ -402,9 +402,9 @@ public final class R {
|
|||
public static final int download_repeat_single=0x7f09005f;
|
||||
public static final int download_visualizer_off=0x7f090061;
|
||||
public static final int download_visualizer_on=0x7f090060;
|
||||
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 equalizer_enabled=0x7f090101;
|
||||
public static final int equalizer_label=0x7f090100;
|
||||
public static final int equalizer_preset=0x7f090102;
|
||||
public static final int error_label=0x7f09006b;
|
||||
public static final int help_back=0x7f090027;
|
||||
public static final int help_close=0x7f090028;
|
||||
|
|
@ -439,14 +439,14 @@ public final class R {
|
|||
/** <string name="settings.screen_lit_title">TODO: Keep screen on</string>
|
||||
<string name="settings.screen_lit_summary">TODO: Keeping the screen on when downloading may improve download speed</string>
|
||||
*/
|
||||
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 music_service_retry=0x7f0900ee;
|
||||
public static final int parser_artist_count=0x7f0900fc;
|
||||
public static final int parser_not_authenticated=0x7f0900fa;
|
||||
public static final int parser_not_authorized=0x7f0900fb;
|
||||
public static final int parser_reading=0x7f0900f6;
|
||||
public static final int parser_reading_done=0x7f0900f7;
|
||||
public static final int parser_upgrade_client=0x7f0900f8;
|
||||
public static final int parser_upgrade_server=0x7f0900f9;
|
||||
public static final int play_video_loading=0x7f09002b;
|
||||
public static final int play_video_noplugin=0x7f09002c;
|
||||
/** <string name="menu.exit">TODO: Exit</string>
|
||||
|
|
@ -481,21 +481,22 @@ public final class R {
|
|||
public static final int select_album_play_all=0x7f09003f;
|
||||
public static final int select_album_searching=0x7f09003e;
|
||||
public static final int select_album_select=0x7f090039;
|
||||
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_artist_all_folders=0x7f0900ff;
|
||||
public static final int select_artist_folder=0x7f0900fe;
|
||||
public static final int select_artist_refresh=0x7f0900fd;
|
||||
public static final int select_playlist_empty=0x7f090047;
|
||||
public static final int service_connecting=0x7f0900f4;
|
||||
public static final int service_connecting=0x7f0900f5;
|
||||
public static final int settings_appearance_title=0x7f090080;
|
||||
public static final int settings_buffer_length=0x7f0900b3;
|
||||
public static final int settings_buffer_length_10=0x7f0900b8;
|
||||
public static final int settings_buffer_length_12=0x7f0900b9;
|
||||
public static final int settings_buffer_length_15=0x7f0900ba;
|
||||
public static final int settings_buffer_length_2=0x7f0900b5;
|
||||
public static final int settings_buffer_length_20=0x7f0900bb;
|
||||
public static final int settings_buffer_length_30=0x7f0900bc;
|
||||
public static final int settings_buffer_length_5=0x7f0900b6;
|
||||
public static final int settings_buffer_length_8=0x7f0900b7;
|
||||
public static final int settings_buffer_length_1=0x7f0900b5;
|
||||
public static final int settings_buffer_length_10=0x7f0900b9;
|
||||
public static final int settings_buffer_length_12=0x7f0900ba;
|
||||
public static final int settings_buffer_length_15=0x7f0900bb;
|
||||
public static final int settings_buffer_length_2=0x7f0900b6;
|
||||
public static final int settings_buffer_length_20=0x7f0900bc;
|
||||
public static final int settings_buffer_length_30=0x7f0900bd;
|
||||
public static final int settings_buffer_length_5=0x7f0900b7;
|
||||
public static final int settings_buffer_length_8=0x7f0900b8;
|
||||
public static final int settings_cache_location=0x7f090078;
|
||||
public static final int settings_cache_location_error=0x7f090079;
|
||||
public static final int settings_cache_size=0x7f090077;
|
||||
|
|
@ -511,9 +512,9 @@ public final class R {
|
|||
public static final int settings_cache_title=0x7f090075;
|
||||
public static final int settings_clear_search_history=0x7f0900a5;
|
||||
public static final int settings_connection_failure=0x7f09007d;
|
||||
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_default_albums=0x7f0900ec;
|
||||
public static final int settings_default_artists=0x7f0900eb;
|
||||
public static final int settings_default_songs=0x7f0900ed;
|
||||
public static final int settings_hide_media_summary=0x7f0900ad;
|
||||
/** <string name="settings.scrobble_title">TODO: Scrobble to Last.fm</string>
|
||||
<string name="settings.scrobble_summary">TODO: Remember to set up your Last.fm user and password on the Subsonic server</string>
|
||||
|
|
@ -522,26 +523,26 @@ public final class R {
|
|||
public static final int settings_hide_media_toast=0x7f0900ae;
|
||||
public static final int settings_invalid_url=0x7f09007e;
|
||||
public static final int settings_invalid_username=0x7f09007f;
|
||||
public static final int settings_max_albums=0x7f0900cd;
|
||||
public static final int settings_max_albums_10=0x7f0900cf;
|
||||
public static final int settings_max_albums_100=0x7f0900d4;
|
||||
public static final int settings_max_albums_20=0x7f0900d0;
|
||||
public static final int settings_max_albums_250=0x7f0900d5;
|
||||
public static final int settings_max_albums_30=0x7f0900d1;
|
||||
public static final int settings_max_albums_40=0x7f0900d2;
|
||||
public static final int settings_max_albums_5=0x7f0900ce;
|
||||
public static final int settings_max_albums_50=0x7f0900d3;
|
||||
public static final int settings_max_albums_500=0x7f0900d6;
|
||||
public static final int settings_max_artists=0x7f0900e0;
|
||||
public static final int settings_max_artists_10=0x7f0900e3;
|
||||
public static final int settings_max_artists_100=0x7f0900e7;
|
||||
public static final int settings_max_artists_200=0x7f0900e8;
|
||||
public static final int settings_max_artists_25=0x7f0900e4;
|
||||
public static final int settings_max_artists_3=0x7f0900e1;
|
||||
public static final int settings_max_artists_5=0x7f0900e2;
|
||||
public static final int settings_max_artists_50=0x7f0900e5;
|
||||
public static final int settings_max_artists_500=0x7f0900e9;
|
||||
public static final int settings_max_artists_75=0x7f0900e6;
|
||||
public static final int settings_max_albums=0x7f0900ce;
|
||||
public static final int settings_max_albums_10=0x7f0900d0;
|
||||
public static final int settings_max_albums_100=0x7f0900d5;
|
||||
public static final int settings_max_albums_20=0x7f0900d1;
|
||||
public static final int settings_max_albums_250=0x7f0900d6;
|
||||
public static final int settings_max_albums_30=0x7f0900d2;
|
||||
public static final int settings_max_albums_40=0x7f0900d3;
|
||||
public static final int settings_max_albums_5=0x7f0900cf;
|
||||
public static final int settings_max_albums_50=0x7f0900d4;
|
||||
public static final int settings_max_albums_500=0x7f0900d7;
|
||||
public static final int settings_max_artists=0x7f0900e1;
|
||||
public static final int settings_max_artists_10=0x7f0900e4;
|
||||
public static final int settings_max_artists_100=0x7f0900e8;
|
||||
public static final int settings_max_artists_25=0x7f0900e5;
|
||||
public static final int settings_max_artists_250=0x7f0900e9;
|
||||
public static final int settings_max_artists_3=0x7f0900e2;
|
||||
public static final int settings_max_artists_5=0x7f0900e3;
|
||||
public static final int settings_max_artists_50=0x7f0900e6;
|
||||
public static final int settings_max_artists_500=0x7f0900ea;
|
||||
public static final int settings_max_artists_75=0x7f0900e7;
|
||||
public static final int settings_max_bitrate_112=0x7f09008d;
|
||||
public static final int settings_max_bitrate_128=0x7f09008e;
|
||||
public static final int settings_max_bitrate_160=0x7f09008f;
|
||||
|
|
@ -555,26 +556,26 @@ public final class R {
|
|||
public static final int settings_max_bitrate_mobile=0x7f090088;
|
||||
public static final int settings_max_bitrate_unlimited=0x7f090093;
|
||||
public static final int settings_max_bitrate_wifi=0x7f090087;
|
||||
public static final int settings_max_songs=0x7f0900d7;
|
||||
public static final int settings_max_songs_10=0x7f0900d9;
|
||||
public static final int settings_max_songs_100=0x7f0900dd;
|
||||
public static final int settings_max_songs_200=0x7f0900de;
|
||||
public static final int settings_max_songs_25=0x7f0900da;
|
||||
public static final int settings_max_songs_5=0x7f0900d8;
|
||||
public static final int settings_max_songs_50=0x7f0900db;
|
||||
public static final int settings_max_songs_500=0x7f0900df;
|
||||
public static final int settings_max_songs_75=0x7f0900dc;
|
||||
public static final int settings_max_songs=0x7f0900d8;
|
||||
public static final int settings_max_songs_10=0x7f0900da;
|
||||
public static final int settings_max_songs_100=0x7f0900de;
|
||||
public static final int settings_max_songs_25=0x7f0900db;
|
||||
public static final int settings_max_songs_250=0x7f0900df;
|
||||
public static final int settings_max_songs_5=0x7f0900d9;
|
||||
public static final int settings_max_songs_50=0x7f0900dc;
|
||||
public static final int settings_max_songs_500=0x7f0900e0;
|
||||
public static final int settings_max_songs_75=0x7f0900dd;
|
||||
public static final int settings_media_button_summary=0x7f0900b0;
|
||||
public static final int settings_media_button_title=0x7f0900af;
|
||||
public static final int settings_network_timeout=0x7f0900b4;
|
||||
public static final int settings_network_timeout_105000=0x7f0900c3;
|
||||
public static final int settings_network_timeout_120000=0x7f0900c4;
|
||||
public static final int settings_network_timeout_15000=0x7f0900bd;
|
||||
public static final int settings_network_timeout_30000=0x7f0900be;
|
||||
public static final int settings_network_timeout_45000=0x7f0900bf;
|
||||
public static final int settings_network_timeout_60000=0x7f0900c0;
|
||||
public static final int settings_network_timeout_75000=0x7f0900c1;
|
||||
public static final int settings_network_timeout_90000=0x7f0900c2;
|
||||
public static final int settings_network_timeout_105000=0x7f0900c4;
|
||||
public static final int settings_network_timeout_120000=0x7f0900c5;
|
||||
public static final int settings_network_timeout_15000=0x7f0900be;
|
||||
public static final int settings_network_timeout_30000=0x7f0900bf;
|
||||
public static final int settings_network_timeout_45000=0x7f0900c0;
|
||||
public static final int settings_network_timeout_60000=0x7f0900c1;
|
||||
public static final int settings_network_timeout_75000=0x7f0900c2;
|
||||
public static final int settings_network_timeout_90000=0x7f0900c3;
|
||||
public static final int settings_network_title=0x7f090086;
|
||||
public static final int settings_other_title=0x7f0900a7;
|
||||
public static final int settings_playback_control_title=0x7f0900a9;
|
||||
|
|
@ -598,12 +599,12 @@ public final class R {
|
|||
public static final int settings_server_unused2=0x7f090070;
|
||||
public static final int settings_server_username=0x7f090073;
|
||||
public static final int settings_servers_title=0x7f09006e;
|
||||
public static final int settings_show_lockscreen_controls=0x7f0900c9;
|
||||
public static final int settings_show_lockscreen_controls_summary=0x7f0900ca;
|
||||
public static final int settings_show_notification=0x7f0900c5;
|
||||
public static final int settings_show_notification_always=0x7f0900c7;
|
||||
public static final int settings_show_notification_always_summary=0x7f0900c8;
|
||||
public static final int settings_show_notification_summary=0x7f0900c6;
|
||||
public static final int settings_show_lockscreen_controls=0x7f0900ca;
|
||||
public static final int settings_show_lockscreen_controls_summary=0x7f0900cb;
|
||||
public static final int settings_show_notification=0x7f0900c6;
|
||||
public static final int settings_show_notification_always=0x7f0900c8;
|
||||
public static final int settings_show_notification_always_summary=0x7f0900c9;
|
||||
public static final int settings_show_notification_summary=0x7f0900c7;
|
||||
public static final int settings_test_connection_title=0x7f09006d;
|
||||
public static final int settings_testing_connection=0x7f09007a;
|
||||
public static final int settings_testing_ok=0x7f09007b;
|
||||
|
|
@ -613,21 +614,21 @@ public final class R {
|
|||
public static final int settings_theme_fullscreenlight=0x7f090083;
|
||||
public static final int settings_theme_light=0x7f090084;
|
||||
public static final int settings_theme_title=0x7f090081;
|
||||
public static final int settings_theme_wheat=0x7f090109;
|
||||
public static final int settings_theme_wheat=0x7f09010a;
|
||||
public static final int settings_title=0x7f09006c;
|
||||
public static final int settings_use_stream_proxy=0x7f0900cb;
|
||||
public static final int settings_use_stream_proxy_summary=0x7f0900cc;
|
||||
public static final int settings_use_stream_proxy=0x7f0900cc;
|
||||
public static final int settings_use_stream_proxy_summary=0x7f0900cd;
|
||||
public static final int settings_wifi_required_summary=0x7f090095;
|
||||
public static final int settings_wifi_required_title=0x7f090094;
|
||||
public static final int song_details_all=0x7f090068;
|
||||
public static final int song_details_kbps=0x7f090069;
|
||||
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 int util_bytes_format_byte=0x7f090109;
|
||||
public static final int util_bytes_format_gigabyte=0x7f090106;
|
||||
public static final int util_bytes_format_kilobyte=0x7f090108;
|
||||
public static final int util_bytes_format_megabyte=0x7f090107;
|
||||
public static final int widget_initial_text=0x7f090103;
|
||||
public static final int widget_sdcard_busy=0x7f090104;
|
||||
public static final int widget_sdcard_missing=0x7f090105;
|
||||
}
|
||||
public static final class style {
|
||||
public static final int Dark=0x7f0b0000;
|
||||
|
|
|
|||
|
|
@ -1,224 +1,227 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<string-array name="themeValues">
|
||||
<item>light</item>
|
||||
<item>dark</item>
|
||||
<item>fullscreen</item>
|
||||
<item>fullscreenlight</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="themeNames">
|
||||
<item>@string/settings.theme_light</item>
|
||||
<item>@string/settings.theme_dark</item>
|
||||
<item>@string/settings.theme_fullscreen</item>
|
||||
<item>@string/settings.theme_fullscreenlight</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="preloadCountValues">
|
||||
<item>1</item>
|
||||
<item>2</item>
|
||||
<item>3</item>
|
||||
<item>5</item>
|
||||
<item>10</item>
|
||||
<item>-1</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="preloadCountNames">
|
||||
<item>@string/settings.preload_1</item>
|
||||
<item>@string/settings.preload_2</item>
|
||||
<item>@string/settings.preload_3</item>
|
||||
<item>@string/settings.preload_5</item>
|
||||
<item>@string/settings.preload_10</item>
|
||||
<item>@string/settings.preload_unlimited</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="cacheSizeValues">
|
||||
<item>100</item>
|
||||
<item>200</item>
|
||||
<item>500</item>
|
||||
<item>1000</item>
|
||||
<item>2000</item>
|
||||
<item>5000</item>
|
||||
<item>10000</item>
|
||||
<item>20000</item>
|
||||
<item>-1</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="cacheSizeNames">
|
||||
<item>@string/settings.cache_size_100</item>
|
||||
<item>@string/settings.cache_size_200</item>
|
||||
<item>@string/settings.cache_size_500</item>
|
||||
<item>@string/settings.cache_size_1000</item>
|
||||
<item>@string/settings.cache_size_2000</item>
|
||||
<item>@string/settings.cache_size_5000</item>
|
||||
<item>@string/settings.cache_size_10000</item>
|
||||
<item>@string/settings.cache_size_20000</item>
|
||||
<item>@string/settings.cache_size_unlimited</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="maxBitrateValues">
|
||||
<item>32</item>
|
||||
<item>64</item>
|
||||
<item>80</item>
|
||||
<item>96</item>
|
||||
<item>112</item>
|
||||
<item>128</item>
|
||||
<item>160</item>
|
||||
<item>192</item>
|
||||
<item>256</item>
|
||||
<item>320</item>
|
||||
<item>0</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="maxBitrateNames">
|
||||
<item>@string/settings.max_bitrate_32</item>
|
||||
<item>@string/settings.max_bitrate_64</item>
|
||||
<item>@string/settings.max_bitrate_80</item>
|
||||
<item>@string/settings.max_bitrate_96</item>
|
||||
<item>@string/settings.max_bitrate_112</item>
|
||||
<item>@string/settings.max_bitrate_128</item>
|
||||
<item>@string/settings.max_bitrate_160</item>
|
||||
<item>@string/settings.max_bitrate_192</item>
|
||||
<item>@string/settings.max_bitrate_256</item>
|
||||
<item>@string/settings.max_bitrate_320</item>
|
||||
<item>@string/settings.max_bitrate_unlimited</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="bufferLengthValues">
|
||||
<item>2</item>
|
||||
<item>5</item>
|
||||
<item>8</item>
|
||||
<item>10</item>
|
||||
<item>12</item>
|
||||
<item>15</item>
|
||||
<item>20</item>
|
||||
<item>30</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="bufferLengthNames">
|
||||
<item>@string/settings.buffer_length_2</item>
|
||||
<item>@string/settings.buffer_length_5</item>
|
||||
<item>@string/settings.buffer_length_8</item>
|
||||
<item>@string/settings.buffer_length_10</item>
|
||||
<item>@string/settings.buffer_length_12</item>
|
||||
<item>@string/settings.buffer_length_15</item>
|
||||
<item>@string/settings.buffer_length_20</item>
|
||||
<item>@string/settings.buffer_length_30</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="networkTimeoutValues">
|
||||
<item>15000</item>
|
||||
<item>30000</item>
|
||||
<item>45000</item>
|
||||
<item>60000</item>
|
||||
<item>75000</item>
|
||||
<item>90000</item>
|
||||
<item>105000</item>
|
||||
<item>120000</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="networkTimeoutNames">
|
||||
<item>@string/settings.network_timeout_15000</item>
|
||||
<item>@string/settings.network_timeout_30000</item>
|
||||
<item>@string/settings.network_timeout_45000</item>
|
||||
<item>@string/settings.network_timeout_60000</item>
|
||||
<item>@string/settings.network_timeout_75000</item>
|
||||
<item>@string/settings.network_timeout_90000</item>
|
||||
<item>@string/settings.network_timeout_105000</item>
|
||||
<item>@string/settings.network_timeout_120000</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="maxAlbumsValues">
|
||||
<item>5</item>
|
||||
<item>10</item>
|
||||
<item>20</item>
|
||||
<item>30</item>
|
||||
<item>40</item>
|
||||
<item>50</item>
|
||||
<item>100</item>
|
||||
<item>250</item>
|
||||
<item>500</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="maxAlbumsNames">
|
||||
<item>@string/settings.max_albums_5</item>
|
||||
<item>@string/settings.max_albums_10</item>
|
||||
<item>@string/settings.max_albums_20</item>
|
||||
<item>@string/settings.max_albums_30</item>
|
||||
<item>@string/settings.max_albums_40</item>
|
||||
<item>@string/settings.max_albums_50</item>
|
||||
<item>@string/settings.max_albums_100</item>
|
||||
<item>@string/settings.max_albums_250</item>
|
||||
<item>@string/settings.max_albums_500</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="maxSongsValues">
|
||||
<item>5</item>
|
||||
<item>10</item>
|
||||
<item>25</item>
|
||||
<item>50</item>
|
||||
<item>75</item>
|
||||
<item>100</item>
|
||||
<item>200</item>
|
||||
<item>500</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="maxSongsNames">
|
||||
<item>@string/settings.max_songs_5</item>
|
||||
<item>@string/settings.max_songs_10</item>
|
||||
<item>@string/settings.max_songs_25</item>
|
||||
<item>@string/settings.max_songs_50</item>
|
||||
<item>@string/settings.max_songs_75</item>
|
||||
<item>@string/settings.max_songs_100</item>
|
||||
<item>@string/settings.max_songs_200</item>
|
||||
<item>@string/settings.max_songs_500</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="maxArtistsValues">
|
||||
<item>5</item>
|
||||
<item>10</item>
|
||||
<item>25</item>
|
||||
<item>50</item>
|
||||
<item>75</item>
|
||||
<item>100</item>
|
||||
<item>200</item>
|
||||
<item>500</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="maxArtistsNames">
|
||||
<item>@string/settings.max_artists_5</item>
|
||||
<item>@string/settings.max_artists_10</item>
|
||||
<item>@string/settings.max_artists_25</item>
|
||||
<item>@string/settings.max_artists_50</item>
|
||||
<item>@string/settings.max_artists_75</item>
|
||||
<item>@string/settings.max_artists_100</item>
|
||||
<item>@string/settings.max_artists_200</item>
|
||||
<item>@string/settings.max_artists_500</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="defaultSearchValues">
|
||||
<item>3</item>
|
||||
<item>5</item>
|
||||
<item>10</item>
|
||||
<item>25</item>
|
||||
<item>50</item>
|
||||
<item>75</item>
|
||||
<item>100</item>
|
||||
<item>200</item>
|
||||
<item>500</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="defaultSearchNames">
|
||||
<item>@string/settings.max_artists_3</item>
|
||||
<item>@string/settings.max_artists_5</item>
|
||||
<item>@string/settings.max_artists_10</item>
|
||||
<item>@string/settings.max_artists_25</item>
|
||||
<item>@string/settings.max_artists_50</item>
|
||||
<item>@string/settings.max_artists_75</item>
|
||||
<item>@string/settings.max_artists_100</item>
|
||||
<item>@string/settings.max_artists_200</item>
|
||||
<item>@string/settings.max_artists_500</item>
|
||||
</string-array>
|
||||
|
||||
</resources>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<string-array name="themeValues">
|
||||
<item>light</item>
|
||||
<item>dark</item>
|
||||
<item>fullscreen</item>
|
||||
<item>fullscreenlight</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="themeNames">
|
||||
<item>@string/settings.theme_light</item>
|
||||
<item>@string/settings.theme_dark</item>
|
||||
<item>@string/settings.theme_fullscreen</item>
|
||||
<item>@string/settings.theme_fullscreenlight</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="preloadCountValues">
|
||||
<item>1</item>
|
||||
<item>2</item>
|
||||
<item>3</item>
|
||||
<item>5</item>
|
||||
<item>10</item>
|
||||
<item>-1</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="preloadCountNames">
|
||||
<item>@string/settings.preload_1</item>
|
||||
<item>@string/settings.preload_2</item>
|
||||
<item>@string/settings.preload_3</item>
|
||||
<item>@string/settings.preload_5</item>
|
||||
<item>@string/settings.preload_10</item>
|
||||
<item>@string/settings.preload_unlimited</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="cacheSizeValues">
|
||||
<item>100</item>
|
||||
<item>200</item>
|
||||
<item>500</item>
|
||||
<item>1000</item>
|
||||
<item>2000</item>
|
||||
<item>5000</item>
|
||||
<item>10000</item>
|
||||
<item>20000</item>
|
||||
<item>-1</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="cacheSizeNames">
|
||||
<item>@string/settings.cache_size_100</item>
|
||||
<item>@string/settings.cache_size_200</item>
|
||||
<item>@string/settings.cache_size_500</item>
|
||||
<item>@string/settings.cache_size_1000</item>
|
||||
<item>@string/settings.cache_size_2000</item>
|
||||
<item>@string/settings.cache_size_5000</item>
|
||||
<item>@string/settings.cache_size_10000</item>
|
||||
<item>@string/settings.cache_size_20000</item>
|
||||
<item>@string/settings.cache_size_unlimited</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="maxBitrateValues">
|
||||
<item>32</item>
|
||||
<item>64</item>
|
||||
<item>80</item>
|
||||
<item>96</item>
|
||||
<item>112</item>
|
||||
<item>128</item>
|
||||
<item>160</item>
|
||||
<item>192</item>
|
||||
<item>256</item>
|
||||
<item>320</item>
|
||||
<item>0</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="maxBitrateNames">
|
||||
<item>@string/settings.max_bitrate_32</item>
|
||||
<item>@string/settings.max_bitrate_64</item>
|
||||
<item>@string/settings.max_bitrate_80</item>
|
||||
<item>@string/settings.max_bitrate_96</item>
|
||||
<item>@string/settings.max_bitrate_112</item>
|
||||
<item>@string/settings.max_bitrate_128</item>
|
||||
<item>@string/settings.max_bitrate_160</item>
|
||||
<item>@string/settings.max_bitrate_192</item>
|
||||
<item>@string/settings.max_bitrate_256</item>
|
||||
<item>@string/settings.max_bitrate_320</item>
|
||||
<item>@string/settings.max_bitrate_unlimited</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="bufferLengthValues">
|
||||
<item>1</item>
|
||||
<item>2</item>
|
||||
<item>5</item>
|
||||
<item>8</item>
|
||||
<item>10</item>
|
||||
<item>12</item>
|
||||
<item>15</item>
|
||||
<item>20</item>
|
||||
<item>30</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="bufferLengthNames">
|
||||
<item>@string/settings.buffer_length_1</item>
|
||||
<item>@string/settings.buffer_length_2</item>
|
||||
<item>@string/settings.buffer_length_2</item>
|
||||
<item>@string/settings.buffer_length_5</item>
|
||||
<item>@string/settings.buffer_length_8</item>
|
||||
<item>@string/settings.buffer_length_10</item>
|
||||
<item>@string/settings.buffer_length_12</item>
|
||||
<item>@string/settings.buffer_length_15</item>
|
||||
<item>@string/settings.buffer_length_20</item>
|
||||
<item>@string/settings.buffer_length_30</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="networkTimeoutValues">
|
||||
<item>15000</item>
|
||||
<item>30000</item>
|
||||
<item>45000</item>
|
||||
<item>60000</item>
|
||||
<item>75000</item>
|
||||
<item>90000</item>
|
||||
<item>105000</item>
|
||||
<item>120000</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="networkTimeoutNames">
|
||||
<item>@string/settings.network_timeout_15000</item>
|
||||
<item>@string/settings.network_timeout_30000</item>
|
||||
<item>@string/settings.network_timeout_45000</item>
|
||||
<item>@string/settings.network_timeout_60000</item>
|
||||
<item>@string/settings.network_timeout_75000</item>
|
||||
<item>@string/settings.network_timeout_90000</item>
|
||||
<item>@string/settings.network_timeout_105000</item>
|
||||
<item>@string/settings.network_timeout_120000</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="maxAlbumsValues">
|
||||
<item>5</item>
|
||||
<item>10</item>
|
||||
<item>20</item>
|
||||
<item>30</item>
|
||||
<item>40</item>
|
||||
<item>50</item>
|
||||
<item>100</item>
|
||||
<item>250</item>
|
||||
<item>500</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="maxAlbumsNames">
|
||||
<item>@string/settings.max_albums_5</item>
|
||||
<item>@string/settings.max_albums_10</item>
|
||||
<item>@string/settings.max_albums_20</item>
|
||||
<item>@string/settings.max_albums_30</item>
|
||||
<item>@string/settings.max_albums_40</item>
|
||||
<item>@string/settings.max_albums_50</item>
|
||||
<item>@string/settings.max_albums_100</item>
|
||||
<item>@string/settings.max_albums_250</item>
|
||||
<item>@string/settings.max_albums_500</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="maxSongsValues">
|
||||
<item>5</item>
|
||||
<item>10</item>
|
||||
<item>25</item>
|
||||
<item>50</item>
|
||||
<item>75</item>
|
||||
<item>100</item>
|
||||
<item>250</item>
|
||||
<item>500</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="maxSongsNames">
|
||||
<item>@string/settings.max_songs_5</item>
|
||||
<item>@string/settings.max_songs_10</item>
|
||||
<item>@string/settings.max_songs_25</item>
|
||||
<item>@string/settings.max_songs_50</item>
|
||||
<item>@string/settings.max_songs_75</item>
|
||||
<item>@string/settings.max_songs_100</item>
|
||||
<item>@string/settings.max_songs_250</item>
|
||||
<item>@string/settings.max_songs_500</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="maxArtistsValues">
|
||||
<item>5</item>
|
||||
<item>10</item>
|
||||
<item>25</item>
|
||||
<item>50</item>
|
||||
<item>75</item>
|
||||
<item>100</item>
|
||||
<item>250</item>
|
||||
<item>500</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="maxArtistsNames">
|
||||
<item>@string/settings.max_artists_5</item>
|
||||
<item>@string/settings.max_artists_10</item>
|
||||
<item>@string/settings.max_artists_25</item>
|
||||
<item>@string/settings.max_artists_50</item>
|
||||
<item>@string/settings.max_artists_75</item>
|
||||
<item>@string/settings.max_artists_100</item>
|
||||
<item>@string/settings.max_artists_250</item>
|
||||
<item>@string/settings.max_artists_500</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="defaultSearchValues">
|
||||
<item>3</item>
|
||||
<item>5</item>
|
||||
<item>10</item>
|
||||
<item>25</item>
|
||||
<item>50</item>
|
||||
<item>75</item>
|
||||
<item>100</item>
|
||||
<item>250</item>
|
||||
<item>500</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="defaultSearchNames">
|
||||
<item>@string/settings.max_artists_3</item>
|
||||
<item>@string/settings.max_artists_5</item>
|
||||
<item>@string/settings.max_artists_10</item>
|
||||
<item>@string/settings.max_artists_25</item>
|
||||
<item>@string/settings.max_artists_50</item>
|
||||
<item>@string/settings.max_artists_75</item>
|
||||
<item>@string/settings.max_artists_100</item>
|
||||
<item>@string/settings.max_artists_250</item>
|
||||
<item>@string/settings.max_artists_500</item>
|
||||
</string-array>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -199,7 +199,8 @@
|
|||
<string name="settings.screen_lit_title">Keep Screen On</string>
|
||||
<string name="settings.screen_lit_summary">Keeping the screen on while downloading improves download speed.</string>
|
||||
<string name="settings.buffer_length">Buffer Length</string>
|
||||
<string name="settings.network_timeout">Network Timeout</string>
|
||||
<string name="settings.network_timeout">Network Timeout</string>
|
||||
<string name="settings.buffer_length_1">1 second</string>
|
||||
<string name="settings.buffer_length_2">2 seconds</string>
|
||||
<string name="settings.buffer_length_5">5 seconds</string>
|
||||
<string name="settings.buffer_length_8">8 seconds</string>
|
||||
|
|
@ -241,7 +242,7 @@
|
|||
<string name="settings.max_songs_50">50</string>
|
||||
<string name="settings.max_songs_75">75</string>
|
||||
<string name="settings.max_songs_100">100</string>
|
||||
<string name="settings.max_songs_200">200</string>
|
||||
<string name="settings.max_songs_250">250</string>
|
||||
<string name="settings.max_songs_500">500</string>
|
||||
<string name="settings.max_artists">Max Artists</string>
|
||||
<string name="settings.max_artists_3">3</string>
|
||||
|
|
@ -251,7 +252,7 @@
|
|||
<string name="settings.max_artists_50">50</string>
|
||||
<string name="settings.max_artists_75">75</string>
|
||||
<string name="settings.max_artists_100">100</string>
|
||||
<string name="settings.max_artists_200">200</string>
|
||||
<string name="settings.max_artists_250">250</string>
|
||||
<string name="settings.max_artists_500">500</string>
|
||||
<string name="settings.default_artists">Default Artists</string>
|
||||
<string name="settings.default_albums">Default Albums</string>
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ public class DownloadServiceImpl extends Service implements DownloadService {
|
|||
|
||||
mediaPlayer = new MediaPlayer();
|
||||
mediaPlayer.setWakeMode(this, PowerManager.PARTIAL_WAKE_LOCK);
|
||||
|
||||
mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
|
||||
mediaPlayer.setOnErrorListener(new MediaPlayer.OnErrorListener() {
|
||||
@Override
|
||||
public boolean onError(MediaPlayer mediaPlayer, int what, int more) {
|
||||
|
|
@ -759,17 +759,18 @@ public class DownloadServiceImpl extends Service implements DownloadService {
|
|||
Intent intent = new Intent(Intent.ACTION_MEDIA_BUTTON);
|
||||
intent.setComponent(new ComponentName(this.getPackageName(), MediaButtonIntentReceiver.class.getName()));
|
||||
remoteControlClient = new RemoteControlClient(PendingIntent.getBroadcast(this, 0, intent, 0));
|
||||
audioManager.registerRemoteControlClient(remoteControlClient);
|
||||
|
||||
remoteControlClient.setTransportControlFlags(
|
||||
RemoteControlClient.FLAG_KEY_MEDIA_PLAY |
|
||||
RemoteControlClient.FLAG_KEY_MEDIA_PAUSE |
|
||||
RemoteControlClient.FLAG_KEY_MEDIA_NEXT |
|
||||
RemoteControlClient.FLAG_KEY_MEDIA_PREVIOUS |
|
||||
RemoteControlClient.FLAG_KEY_MEDIA_PLAY_PAUSE |
|
||||
RemoteControlClient.FLAG_KEY_MEDIA_STOP);
|
||||
}
|
||||
|
||||
|
||||
audioManager.registerRemoteControlClient(remoteControlClient);
|
||||
|
||||
remoteControlClient.setTransportControlFlags(
|
||||
RemoteControlClient.FLAG_KEY_MEDIA_PLAY |
|
||||
RemoteControlClient.FLAG_KEY_MEDIA_PAUSE |
|
||||
RemoteControlClient.FLAG_KEY_MEDIA_NEXT |
|
||||
RemoteControlClient.FLAG_KEY_MEDIA_PREVIOUS |
|
||||
RemoteControlClient.FLAG_KEY_MEDIA_PLAY_PAUSE |
|
||||
RemoteControlClient.FLAG_KEY_MEDIA_STOP);
|
||||
|
||||
switch (playerState)
|
||||
{
|
||||
case STARTED:
|
||||
|
|
@ -785,32 +786,32 @@ public class DownloadServiceImpl extends Service implements DownloadService {
|
|||
}
|
||||
|
||||
try {
|
||||
if (currentPlaying != null) {
|
||||
if (currentSong != currentPlaying.getSong()) {
|
||||
currentSong = currentPlaying.getSong();
|
||||
|
||||
String artist = currentSong.getArtist();
|
||||
String album = currentSong.getAlbum();
|
||||
String title = artist + " - " + currentSong.getTitle();
|
||||
Integer duration = currentSong.getDuration();
|
||||
if (currentPlaying != null) {
|
||||
if (currentSong != currentPlaying.getSong()) {
|
||||
currentSong = currentPlaying.getSong();
|
||||
}
|
||||
|
||||
MusicService musicService = MusicServiceFactory.getMusicService(this);
|
||||
DisplayMetrics metrics = this.getResources().getDisplayMetrics();
|
||||
int size = Math.min(metrics.widthPixels, metrics.heightPixels);
|
||||
Bitmap bitmap = musicService.getCoverArt(this, currentSong, size, true, null);
|
||||
String artist = currentSong.getArtist();
|
||||
String album = currentSong.getAlbum();
|
||||
String title = artist + " - " + currentSong.getTitle();
|
||||
Integer duration = currentSong.getDuration();
|
||||
|
||||
// Update the remote controls
|
||||
remoteControlClient
|
||||
.editMetadata(true)
|
||||
.putString(MediaMetadataRetriever.METADATA_KEY_TITLE, title)
|
||||
.putString(MediaMetadataRetriever.METADATA_KEY_ARTIST, artist)
|
||||
.putString(MediaMetadataRetriever.METADATA_KEY_ALBUM, album)
|
||||
.putLong(MediaMetadataRetriever.METADATA_KEY_DURATION, duration)
|
||||
.putBitmap(RemoteControlClient.MetadataEditor.BITMAP_KEY_ARTWORK, bitmap)
|
||||
.apply();
|
||||
}
|
||||
}
|
||||
}
|
||||
MusicService musicService = MusicServiceFactory.getMusicService(this);
|
||||
DisplayMetrics metrics = this.getResources().getDisplayMetrics();
|
||||
int size = Math.min(metrics.widthPixels, metrics.heightPixels);
|
||||
Bitmap bitmap = musicService.getCoverArt(this, currentSong, size, true, null);
|
||||
|
||||
// Update the remote controls
|
||||
remoteControlClient
|
||||
.editMetadata(true)
|
||||
.putString(MediaMetadataRetriever.METADATA_KEY_TITLE, title)
|
||||
.putString(MediaMetadataRetriever.METADATA_KEY_ARTIST, artist)
|
||||
.putString(MediaMetadataRetriever.METADATA_KEY_ALBUM, album)
|
||||
.putLong(MediaMetadataRetriever.METADATA_KEY_DURATION, duration)
|
||||
.putBitmap(RemoteControlClient.MetadataEditor.BITMAP_KEY_ARTWORK, bitmap)
|
||||
.apply();
|
||||
}
|
||||
}
|
||||
catch (Exception e) {
|
||||
Log.e(TAG, "Exception in setRemoteControl", e);
|
||||
}
|
||||
|
|
@ -828,6 +829,7 @@ public class DownloadServiceImpl extends Service implements DownloadService {
|
|||
try {
|
||||
final File file = downloadFile.isCompleteFileAvailable() ? downloadFile.getCompleteFile() : downloadFile.getPartialFile();
|
||||
downloadFile.updateModificationDate();
|
||||
|
||||
mediaPlayer.setOnCompletionListener(null);
|
||||
mediaPlayer.setOnBufferingUpdateListener(null);
|
||||
mediaPlayer.reset();
|
||||
|
|
@ -847,8 +849,6 @@ public class DownloadServiceImpl extends Service implements DownloadService {
|
|||
}
|
||||
});
|
||||
|
||||
mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
|
||||
|
||||
String url = file.getPath();
|
||||
String playUrl = url;
|
||||
|
||||
|
|
@ -1071,17 +1071,18 @@ public class DownloadServiceImpl extends Service implements DownloadService {
|
|||
this.downloadFile = downloadFile;
|
||||
this.position = position;
|
||||
partialFile = downloadFile.getPartialFile();
|
||||
int bufferLength = downloadFile.getBufferLength();
|
||||
|
||||
// Calculate roughly how many bytes buffer length corresponds to.
|
||||
int bitRate = downloadFile.getBitRate();
|
||||
long byteCount = Math.max(100000, bitRate * 1024 / 8 * downloadFile.getBufferLength());
|
||||
// Calculate roughly how many bytes buffer length corresponds to.
|
||||
int bitRate = downloadFile.getBitRate();
|
||||
long byteCount = Math.max(100000, bitRate * 1024 / 8 * bufferLength);
|
||||
|
||||
// Find out how large the file should grow before resuming playback.
|
||||
if (position == 0) {
|
||||
expectedFileSize = byteCount;
|
||||
} else {
|
||||
expectedFileSize = partialFile.length() + byteCount;
|
||||
}
|
||||
// Find out how large the file should grow before resuming playback.
|
||||
if (position == 0) {
|
||||
expectedFileSize = byteCount;
|
||||
} else {
|
||||
expectedFileSize = partialFile.length() + byteCount;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -1089,7 +1090,7 @@ public class DownloadServiceImpl extends Service implements DownloadService {
|
|||
setPlayerState(DOWNLOADING);
|
||||
|
||||
while (!bufferComplete()) {
|
||||
Util.sleepQuietly(1000L);
|
||||
Util.sleepQuietly(100L);
|
||||
if (isCancelled()) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -1099,10 +1100,19 @@ public class DownloadServiceImpl extends Service implements DownloadService {
|
|||
|
||||
private boolean bufferComplete() {
|
||||
boolean completeFileAvailable = downloadFile.isCompleteFileAvailable();
|
||||
if (completeFileAvailable) {
|
||||
Log.i(TAG, "Buffering complete: Complete file exists (" + completeFileAvailable + ")");
|
||||
return true;
|
||||
}
|
||||
|
||||
long size = partialFile.length();
|
||||
|
||||
Log.i(TAG, "Buffering " + partialFile + " (" + size + "/" + expectedFileSize + ", " + completeFileAvailable + ")");
|
||||
return completeFileAvailable || size >= expectedFileSize;
|
||||
if (size >= expectedFileSize) {
|
||||
Log.i(TAG, "Buffering complete: " + partialFile + " (" + size + "/" + expectedFileSize + ")");
|
||||
return true;
|
||||
}
|
||||
|
||||
Log.i(TAG, "Buffering incomplete: " + partialFile + " (" + size + "/" + expectedFileSize + ")");
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
Loading…
Reference in New Issue