From 109c253bd93bc7dffd985cbc2d5959cf471f3944 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Sat, 19 Sep 2015 15:40:38 -0700
Subject: #550 Add option to shuffle by albums or by songs

---
 app/src/main/res/values/strings.xml | 3 +++
 app/src/main/res/xml/settings.xml   | 7 +++++++
 2 files changed, 10 insertions(+)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 453cfdb1..d87dbf69 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -459,6 +459,9 @@
 	<string name="settings.start_on_headphones_summary">Start when headphones are plugged in.  This requires the use of a service which starts on boot up to check for the headphone plug event even when DSub is not running.</string>
 	<string name="settings.color_action_bar">Color Action Bar</string>
 	<string name="settings.color_action_bar.summary">Color the action bar and status bar or leave them alone</string>
+	<string name="settings.shuffle_by_album">Shuffle By Album</string>
+	<string name="settings.shuffle_by_album.true">Shuffle order of albums</string>
+	<string name="settings.shuffle_by_album.false">Shuffle all songs together</string>
 
 	<string name="shuffle.title">Shuffle By</string>
 	<string name="shuffle.startYear">Start Year:</string>
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index b30d59fd..dec8d928 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -435,6 +435,13 @@
 		<PreferenceCategory
 			android:title="@string/settings.other_title">
 
+			<CheckBoxPreference
+				android:title="@string/settings.shuffle_by_album"
+				android:key="shuffleByAlbum"
+				android:defaultValue="true"
+				android:summaryOn="@string/settings.shuffle_by_album.true"
+				android:summaryOff="@string/settings.shuffle_by_album.false"/>
+
 			<CheckBoxPreference
 				android:title="@string/settings.scrobble_title"
 				android:summary="@string/settings.scrobble_summary"
-- 
cgit v1.2.3