Merge branch 'master' of https://github.com/daneren2005/Subsonic into SyncAdapter

26 files changed, 76 insertions, 23 deletions

diff --git a/res/drawable-hdpi/download_cached.png b/res/drawable-hdpi/download_cached.png
index d935cb2c..56bfc0e1 100644
--- a/res/drawable-hdpi/download_cached.png
+++ b/res/drawable-hdpi/download_cached.png
diff --git a/res/drawable-hdpi/download_pinned.png b/res/drawable-hdpi/download_pinned.png
index b5b6dfb1..711c7704 100644
--- a/res/drawable-hdpi/download_pinned.png
+++ b/res/drawable-hdpi/download_pinned.png
diff --git a/res/drawable-hdpi/ic_drawer.png b/res/drawable-hdpi/ic_drawer.png
index c59f601c..eb90af58 100644
--- a/res/drawable-hdpi/ic_drawer.png
+++ b/res/drawable-hdpi/ic_drawer.png
diff --git a/res/drawable-hdpi/ic_stat_star.png b/res/drawable-hdpi/ic_stat_star.png
index b16e803c..67ad40f5 100644
--- a/res/drawable-hdpi/ic_stat_star.png
+++ b/res/drawable-hdpi/ic_stat_star.png
diff --git a/res/drawable-hdpi/launch.png b/res/drawable-hdpi/launch.png
index 9caa6675..0c77b9b4 100644
--- a/res/drawable-hdpi/launch.png
+++ b/res/drawable-hdpi/launch.png
diff --git a/res/drawable-hdpi/unknown_album_large.png b/res/drawable-hdpi/unknown_album_large.png
index bd9c6cc9..42c28c7d 100644
--- a/res/drawable-hdpi/unknown_album_large.png
+++ b/res/drawable-hdpi/unknown_album_large.png
diff --git a/res/drawable-mdpi/download_cached.png b/res/drawable-mdpi/download_cached.png
index fa02cc7c..2b5d33d1 100644
--- a/res/drawable-mdpi/download_cached.png
+++ b/res/drawable-mdpi/download_cached.png
diff --git a/res/drawable-mdpi/download_pinned.png b/res/drawable-mdpi/download_pinned.png
index 8e6e8e7a..ce3fe064 100644
--- a/res/drawable-mdpi/download_pinned.png
+++ b/res/drawable-mdpi/download_pinned.png
diff --git a/res/drawable-mdpi/ic_drawer.png b/res/drawable-mdpi/ic_drawer.png
index 1ed2c56e..1681d12c 100644
--- a/res/drawable-mdpi/ic_drawer.png
+++ b/res/drawable-mdpi/ic_drawer.png
diff --git a/res/drawable-mdpi/launch.png b/res/drawable-mdpi/launch.png
index 22e094eb..88887e94 100644
--- a/res/drawable-mdpi/launch.png
+++ b/res/drawable-mdpi/launch.png
diff --git a/res/drawable-xhdpi/download_cached.png b/res/drawable-xhdpi/download_cached.png
index 1ef7c805..70de6f04 100644
--- a/res/drawable-xhdpi/download_cached.png
+++ b/res/drawable-xhdpi/download_cached.png
diff --git a/res/drawable-xhdpi/download_pinned.png b/res/drawable-xhdpi/download_pinned.png
index 09eb6ffb..79bf92e3 100644
--- a/res/drawable-xhdpi/download_pinned.png
+++ b/res/drawable-xhdpi/download_pinned.png
diff --git a/res/drawable-xhdpi/ic_drawer.png b/res/drawable-xhdpi/ic_drawer.png
index a5fa74de..daba1451 100644
--- a/res/drawable-xhdpi/ic_drawer.png
+++ b/res/drawable-xhdpi/ic_drawer.png
diff --git a/res/drawable-xhdpi/launch.png b/res/drawable-xhdpi/launch.png
index f73729d0..0f647dfa 100644
--- a/res/drawable-xhdpi/launch.png
+++ b/res/drawable-xhdpi/launch.png
diff --git a/res/drawable-xxhdpi/download_cached.png b/res/drawable-xxhdpi/download_cached.png
new file mode 100644
index 00000000..243c570e
--- /dev/null
+++ b/res/drawable-xxhdpi/download_cached.png
diff --git a/res/drawable-xxhdpi/download_pinned.png b/res/drawable-xxhdpi/download_pinned.png
new file mode 100644
index 00000000..354ac23d
--- /dev/null
+++ b/res/drawable-xxhdpi/download_pinned.png
diff --git a/res/drawable-xxhdpi/launch.png b/res/drawable-xxhdpi/launch.png
index b067bd9f..cae4f99a 100644
--- a/res/drawable-xxhdpi/launch.png
+++ b/res/drawable-xxhdpi/launch.png
diff --git a/res/layout-port/download.xml b/res/layout-port/download.xml
index 38ab069f..a70160a1 100644
--- a/res/layout-port/download.xml
+++ b/res/layout-port/download.xml
@@ -35,7 +35,7 @@
 						android:layout_height="wrap_content"

 						android:layout_centerHorizontal="true"

 						android:layout_alignParentTop="true"

-						android:scaleType="centerCrop"/>

+						android:scaleType="fitCenter"/>

 

 					<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

 						android:id="@+id/download_overlay_buttons"

diff --git a/res/layout/jukebox_volume.xml b/res/layout/jukebox_volume.xml
index fd718326..0c49f634 100644
--- a/res/layout/jukebox_volume.xml
+++ b/res/layout/jukebox_volume.xml
@@ -32,7 +32,7 @@
 		android:paddingRight="12dip"
 		android:layout_alignParentLeft="true"
 		android:layout_below="@+id/jukebox_volume_title"
-		android:src="?attr/volume"/>
+		android:src="@drawable/ic_action_volume_dark"/>
 
 	<SeekBar
 		android:layout_height="wrap_content"
diff --git a/res/layout/notification_expanded.xml b/res/layout/notification_expanded.xml
index e2246506..3e2c7fcd 100644
--- a/res/layout/notification_expanded.xml
+++ b/res/layout/notification_expanded.xml
@@ -58,40 +58,41 @@
 	        xmlns:android="http://schemas.android.com/apk/res/android"
 	        android:layout_width="fill_parent"
 	        android:layout_height="wrap_content"
-	        android:layout_gravity="center|fill"
-	        android:gravity="center_horizontal"
-	        android:orientation="horizontal" >
+	        android:orientation="horizontal"
+			android:showDividers="middle"
+			android:divider="?android:listDivider">
 
 	        <ImageButton
 	            android:id="@+id/control_previous"
-	            android:layout_width="wrap_content"
-	            android:layout_height="wrap_content"
+				android:layout_width="0dip"
+				android:layout_height="fill_parent"
 	            android:layout_gravity="center"
-	            android:layout_weight="0.0"
+	            android:layout_weight="1"
+				android:padding="10dip"
 	            android:background="@drawable/btn_bg"
-	            android:scaleType="fitXY"
+	            android:scaleType="fitCenter"
 	            android:src="@drawable/notification_previous" />
 
 	        <ImageButton
 	            android:id="@+id/control_pause"
-	            android:layout_width="wrap_content"
-	            android:layout_height="wrap_content"
-	            android:layout_gravity="center"
-	            android:layout_marginLeft="10dp"
-	            android:layout_marginRight="10dp"
-	            android:layout_weight="0.0"
+				android:layout_width="0dip"
+				android:layout_height="fill_parent"
+				android:layout_gravity="center"
+				android:layout_weight="1"
+				android:padding="10dip"
 	            android:background="@drawable/btn_bg"
-	            android:scaleType="fitXY"
+	            android:scaleType="fitCenter"
 	            android:src="@drawable/notification_pause" />
 
 	        <ImageButton
 	            android:id="@+id/control_next"
-	            android:layout_width="wrap_content"
-	            android:layout_height="wrap_content"
-	            android:layout_gravity="center"
-	            android:layout_weight="0.0"
+				android:layout_width="0dip"
+				android:layout_height="fill_parent"
+				android:layout_gravity="center"
+				android:layout_weight="1"
+				android:padding="10dip"
 	            android:background="@drawable/btn_bg"
-	            android:scaleType="fitXY"
+	            android:scaleType="fitCenter"
 	            android:src="@drawable/notification_next" />
 	    </LinearLayout>
 
diff --git a/res/menu/select_artist_context.xml b/res/menu/select_artist_context.xml
index d7a5c6ac..e35cae9e 100644
--- a/res/menu/select_artist_context.xml
+++ b/res/menu/select_artist_context.xml
@@ -30,4 +30,10 @@
 	<item 
 		android:id="@+id/artist_menu_delete"
 		android:title="@string/common.delete"/>
+
+	<group android:id="@+id/server_1_10">
+		<item 
+			android:id="@+id/artist_menu_star"
+			android:title="@string/common.star"/>
+	</group>
 </menu>
diff --git a/res/raw/changelog.xml b/res/raw/changelog.xml
index 819263ac..9a080bf1 100644
--- a/res/raw/changelog.xml
+++ b/res/raw/changelog.xml
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+	<release version="4.2.2" versioncode="71" releasedate="11/22/2013">
+		<change>Added starring for artists for 4.9+ Servers</change>
+		<change>Add ability to place large widget on lockscreen for Android 4.2+</change>
+		<change>Option to use app's custom sorting (on by default)</change>
+		<change>Lots of tablet UI enhancements</change>
+		<change>Updated translations</change>
+		<change>Tons of bug fixes</change>
+	</release>
+	<release version="4.2.1" versioncode="70" releasedate="11/15/2013">
+		<change>Fixed crash when going to download list with Screen On = true</change>
+		<change>Fixed crash when changing volume in RC mode</change>
+	</release>
 	<release version="4.2.0" versioncode="69" releasedate="11/14/2013">
 		<change>Changed from tabs to Pull Out Drawer like newer Google docs specify</change>
 		<change>Major UI update with better scaling icons</change>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 594ff0b9..2da129d6 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -22,6 +22,7 @@
 	<string name="common.stream_external">Stream Video</string>
 	<string name="common.confirm">Confirmar</string>
 	<string name="common.confirm_message">Quieres %1$s %2$s?</string>
+	<string name="common.empty">No se ha encontrado nada</string>
 
     <string name="button_bar.home">Inicio</string>
     <string name="button_bar.browse">Biblioteca</string>
@@ -29,6 +30,7 @@
     <string name="button_bar.playlists">Listas de reproducción</string>
     <string name="button_bar.now_playing">Ahora suena</string>
 	<string name="button_bar.podcasts">Podcasts</string>
+	<string name="button_bar.bookmarks">Marcadores</string>
 	<string name="button_bar.chat">Chat</string>
 
     <string name="main.welcome_title">Bienvenido!</string>
@@ -189,6 +191,8 @@
 	<string name="download.need_download">El vídeo ha de ser descargado antes</string>
 	<string name="download.no_streaming_player">Ningún reproductor puede reproducir este stream</string>
 	<string name="download.playing_out_of">Reproduciendo: %1$d/%2$d</string>
+	<string name="download.save_bookmark_title">Crear marcador</string>
+	<string name="download.save_bookmark">Marcador creado</string>
     
 	<string name="starring_content_starred">Marcado con estrella \"%s\"</string>
 	<string name="starring_content_unstarred">Sin marca de estrella \"%s\"</string>
@@ -198,6 +202,13 @@
 	<string name="updated_playlist">Añadida %1$s canción a \"%2$s\"</string>
     <string name="updated_playlist_error">Error al actualizar \"%s\", inténtelo más tarde.</string>
 	<string name="removed_playlist">Borrar %1$s canciones de \"%2$s\"</string>
+	
+	<string name="bookmark.delete">Borrar marcador</string>
+	<string name="bookmark.deleted">Borrado marcador para \"%s\"</string>
+	<string name="bookmark.deleted_error">Error al borrar el marcador para \"%s\"</string>
+	<string name="bookmark.details">Canción: %1$s
+		\nComentario: %2$s
+		\nPosición: %3$s</string>
 
     <string name="song_details.all">%1$s %2$s</string>
     <string name="song_details.kbps">%d kbps</string>
@@ -311,6 +322,11 @@
 	<string name="settings.temp_loss_pause_lower">Pausar, bajar el volumen cuando sea solicitado</string>
 	<string name="settings.temp_loss_lower">Bajar volumen siempre</string>
 	<string name="settings.temp_loss_nothing">No hacer nada</string>
+	<string name="settings.disconnect_pause_title">Pausar al desconectar</string>
+	<string name="settings.disconnect_pause_both">Pausar en todos los casos</string>
+	<string name="settings.disconnect_pause_headphone">Pausar sólo con auriculares</string>
+	<string name="settings.disconnect_pause_bluetooth">Pausar sólo en bluetooth</string>
+	<string name="settings.disconnect_pause_neither">No hacer nada</string>
 	<string name="settings.persistent_title">Notificación permanente</string>
 	<string name="settings.persistent_summary">Mostrar la notificación incluso tras pausar. Pulsar botón stop para quitarlo.</string>
 	<string name="settings.gapless_playback">Reproducción sin pausas</string>
@@ -324,6 +340,14 @@
 	<string name="settings.video_hls">HTTP Live Stream (HLS) (Requiere Subsonic 4.8+)</string>
 	<string name="settings.video_transcode">Transcodificación directa (Requisitos de vídeo -> configurar mp4 o similar en el servidor)</string>
 	<string name="settings.video_flash">Flash (Requiere Plugin)</string>
+	<string name="settings.cache_screen_title">Caché/Red</string>
+	<string name="settings.playback_title">Reproducción</string>
+	<string name="settings.hide_widget_title">Ocultar Widget</string>
+	<string name="settings.hide_widget_summary">Ocultar widget tras abandonar la aplicación</string>
+	<string name="settings.podcasts_enabled">Podcasts Habilitados</string>
+	<string name="settings.podcasts_enabled_summary">Mostrar o no mostrar el apartado Podcasts en el menú</string>
+	<string name="settings.bookmarks_enabled">Marcadores Habilitados</string>
+	<string name="settings.bookmarks_enabled_summary">Mostrar o no mostrar el apartado Marcadoresen el menú</string>
 
 	<string name="shuffle.title">Iniciar aleatorio por</string>
 	<string name="shuffle.startYear">Año inicial:</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 52c899e2..1a2068f0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -257,6 +257,8 @@
 	<string name="settings.theme_holo_fullscreen">Holo Fullscreen</string>

 	<string name="settings.track_title">Display Track #</string>

 	<string name="settings.track_summary">Display Track # in front of songs if one exists</string>

+	<string name="settings.custom_sort">Custom Sort</string>

+	<string name="settings.custom_sort_summary">Sort directory listings to properly sort by disc number.  Interferes with the servers sort albums by year.</string>

     <string name="settings.network_title">Network</string>

     <string name="settings.max_bitrate_wifi">Max Audio bitrate - Wi-Fi</string>

     <string name="settings.max_bitrate_mobile">Max Audio bitrate - Mobile</string>

@@ -368,7 +370,7 @@
     <string name="background_task.no_network">This program requires network access. Please turn on Wi-Fi or mobile network.</string>

     <string name="background_task.network_error">A network error occurred. Please check the server address or try again later.</string>

     <string name="background_task.not_found">Resource not found. Please check the server address.</string>

-    <string name="background_task.parse_error">Didn\'t understand the reply. Please check the server address.</string>

+    <string name="background_task.parse_error">A problem occurred communicating with the server. Please check the server address and verify that you can connect using a regular browser on your device.</string>

 

     <string name="service.connecting">Contacting server, please wait.</string>

 

diff --git a/res/xml/appwidget4x4.xml b/res/xml/appwidget4x4.xml
index 40956dcf..ca2d1012 100644
--- a/res/xml/appwidget4x4.xml
+++ b/res/xml/appwidget4x4.xml
@@ -4,4 +4,6 @@
 	android:minHeight="250dp"
 	android:updatePeriodMillis="0"
 	android:resizeMode="horizontal|vertical"
-	android:initialLayout="@layout/appwidget4x4"/>
\ No newline at end of file
+	android:initialLayout="@layout/appwidget4x4"
+	android:initialKeyguardLayout="@layout/appwidget4x4"
+	android:widgetCategory="keyguard|home_screen"/>
\ No newline at end of file
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 6f7527ab..777509de 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -43,6 +43,12 @@
 				android:key="hideWidget"
 				android:defaultValue="false"/>
 
+			<CheckBoxPreference
+				android:title="@string/settings.custom_sort"
+				android:summary="@string/settings.custom_sort_summary"
+				android:key="customSortEnabled"
+				android:defaultValue="true"/>
+
 		</PreferenceCategory>
 
 		<PreferenceCategory