diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2015-09-21 08:58:44 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2015-09-21 08:58:44 -0700 |
| commit | 0ac48e7334a0ffd43bd732dec7ba8e9f3d24528d (patch) | |
| tree | a7d582fe7fabc74d028b77145bec7b9f24f93c46 /app/src/main/res | |
| parent | 8d81c6f44330ec931736f6696fa39dea974a1b13 (diff) | |
| parent | 109c253bd93bc7dffd985cbc2d5959cf471f3944 (diff) | |
| download | dsub-0ac48e7334a0ffd43bd732dec7ba8e9f3d24528d.tar.gz dsub-0ac48e7334a0ffd43bd732dec7ba8e9f3d24528d.tar.bz2 dsub-0ac48e7334a0ffd43bd732dec7ba8e9f3d24528d.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/values/strings.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/xml/settings.xml | 7 |
2 files changed, 10 insertions, 0 deletions
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 @@ -436,6 +436,13 @@ 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" android:key="scrobble" |