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

12 files changed, 8 insertions, 2 deletions

diff --git a/res/drawable-hdpi/ic_action_add_dark.png b/res/drawable-hdpi/ic_action_add_dark.png
new file mode 100644
index 00000000..81d535d5
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_add_dark.png
diff --git a/res/drawable-hdpi/ic_action_add_light.png b/res/drawable-hdpi/ic_action_add_light.png
new file mode 100644
index 00000000..0e4f3347
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_add_light.png
diff --git a/res/drawable-mdpi/ic_action_add_dark.png b/res/drawable-mdpi/ic_action_add_dark.png
new file mode 100644
index 00000000..a4c84f0f
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_add_dark.png
diff --git a/res/drawable-mdpi/ic_action_add_light.png b/res/drawable-mdpi/ic_action_add_light.png
new file mode 100644
index 00000000..86097d84
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_add_light.png
diff --git a/res/drawable-xhdpi/ic_action_add_dark.png b/res/drawable-xhdpi/ic_action_add_dark.png
new file mode 100644
index 00000000..93eae7c6
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_add_dark.png
diff --git a/res/drawable-xhdpi/ic_action_add_light.png b/res/drawable-xhdpi/ic_action_add_light.png
new file mode 100644
index 00000000..1ebdb432
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_add_light.png
diff --git a/res/drawable-xxhdpi/ic_action_add_dark.png b/res/drawable-xxhdpi/ic_action_add_dark.png
new file mode 100644
index 00000000..70495672
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_add_dark.png
diff --git a/res/drawable-xxhdpi/ic_action_add_light.png b/res/drawable-xxhdpi/ic_action_add_light.png
new file mode 100644
index 00000000..9322b136
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_add_light.png
diff --git a/res/menu/select_podcasts.xml b/res/menu/select_podcasts.xml
index 2f0ab38a..cd351a19 100644
--- a/res/menu/select_podcasts.xml
+++ b/res/menu/select_podcasts.xml
@@ -9,7 +9,9 @@
 
 	<item 
 		android:id="@+id/menu_add_podcast"
-		android:title="@string/menu.add_podcast"/>
+		android:icon="?attr/add"
+		android:title="@string/menu.add_podcast"
+		compat:showAsAction="always|withText"/>
 
 	<item 
 		android:id="@+id/menu_check"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 1e8b365f..b820c371 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -8,6 +8,7 @@
     <attr name="media_button_start" format="reference"/>
     <attr name="media_button_stop" format="reference"/>
 	<attr name="chat_send" format="reference"/>
+	<attr name="add" format="reference"/>
 	<attr name="download_none" format="reference"/>
 	<attr name="shuffle" format="reference"/>
 	<attr name="refresh" format="reference"/>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3148ae99..add99c11 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -364,7 +364,7 @@
 	<string name="settings.persistent_title">Persistent Notification</string>

 	<string name="settings.persistent_summary">Show the notification even after pausing.  Press the stop button to clear it away.</string>

 	<string name="settings.gapless_playback">Gapless Playback</string>

-	<string name="settings.gapless_playback_summary">The Galaxy S3 seems to be experiencing freezes/other weird issue since the introduction of gapless playback.  Turn this off to fix the issue.</string>

+	<string name="settings.gapless_playback_summary">If you are seeing strange bugs during playback, turning this off may help.</string>

 	<string name="settings.chat_refresh">Chat Refresh Rate (Secs)</string>

 	<string name="settings.chat_enabled">Chat Enabled</string>

 	<string name="settings.chat_enabled_summary">Whether or not to display the chat listing in the pull out drawer</string>

diff --git a/res/values/themes.xml b/res/values/themes.xml
index 8d565802..0f464baa 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -11,6 +11,7 @@
 		<item name="media_button_start">@drawable/media_start_light</item>
 		<item name="media_button_stop">@drawable/media_stop_light</item>
 		<item name="chat_send">@drawable/ic_menu_chat_send_light</item>
+		<item name="add">@drawable/ic_action_add_light</item>
 		<item name="download_none">@drawable/download_none_light</item>
 		<item name="shuffle">@drawable/ic_menu_shuffle_light</item>
 		<item name="refresh">@drawable/ic_menu_refresh_light</item>
@@ -40,6 +41,7 @@
 		<item name="media_button_start">@drawable/media_start_dark</item>
 		<item name="media_button_stop">@drawable/media_stop_dark</item>
 		<item name="chat_send">@drawable/ic_menu_chat_send_dark</item>
+		<item name="add">@drawable/ic_action_add_dark</item>
 		<item name="download_none">@drawable/download_none_dark</item>
 		<item name="shuffle">@drawable/ic_menu_shuffle_dark</item>
 		<item name="refresh">@drawable/ic_menu_refresh_dark</item>
@@ -72,6 +74,7 @@
 		<item name="media_button_start">@drawable/media_start_dark</item>
 		<item name="media_button_stop">@drawable/media_stop_dark</item>
 		<item name="chat_send">@drawable/ic_menu_chat_send_dark</item>
+		<item name="add">@drawable/ic_action_add_dark</item>
 		<item name="download_none">@drawable/download_none_dark</item>
 		<item name="shuffle">@drawable/ic_menu_shuffle_dark</item>
 		<item name="refresh">@drawable/ic_menu_refresh_dark</item>