diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2013-05-01 20:26:11 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2013-05-01 20:26:11 -0700 |
| commit | 934fb55b72424d1710ef3d237062242e034a23d7 (patch) | |
| tree | eb4d0eeb54fdc27baee06bbbafdf575625b15d9a /subsonic-android/res | |
| parent | 93d03bc7ab2b078e48baad33257606e06875f994 (diff) | |
| parent | 442f5839a79f1c823445921b7e7f8f3c634dfd58 (diff) | |
| download | dsub-934fb55b72424d1710ef3d237062242e034a23d7.tar.gz dsub-934fb55b72424d1710ef3d237062242e034a23d7.tar.bz2 dsub-934fb55b72424d1710ef3d237062242e034a23d7.zip | |
Merge branch 'master' of https://github.com/daneren2005/Subsonic.git into Fragments
Diffstat (limited to 'subsonic-android/res')
| -rw-r--r-- | subsonic-android/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | subsonic-android/res/xml/settings.xml | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml index 4e96ad5a..c9c7c991 100644 --- a/subsonic-android/res/values/strings.xml +++ b/subsonic-android/res/values/strings.xml @@ -267,6 +267,8 @@ <string name="settings.temp_loss_nothing">Do Nothing</string>
<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="shuffle.startYear">Start Year:</string>
<string name="shuffle.endYear">End Year:</string>
diff --git a/subsonic-android/res/xml/settings.xml b/subsonic-android/res/xml/settings.xml index a2ae7b20..d21f928f 100644 --- a/subsonic-android/res/xml/settings.xml +++ b/subsonic-android/res/xml/settings.xml @@ -239,6 +239,12 @@ android:key="screenLitOnDownload" android:defaultValue="true"/> + <CheckBoxPreference + android:title="@string/settings.gapless_playback" + android:summary="@string/settings.gapless_playback_summary" + android:key="gaplessPlayback" + android:defaultValue="true"/> + <Preference android:key="clearSearchHistory" android:title="@string/settings.clear_search_history" |