diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2013-03-28 19:47:52 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2013-03-28 19:47:52 -0700 |
| commit | 0efd9216e71ddce379129811af9a6e4135776bbb (patch) | |
| tree | 5b11ba54d6d31949d50af1fe1b14f57103814a88 /subsonic-android/res | |
| parent | ebf090d1a6ce40f582625340d072a8428446dde7 (diff) | |
| parent | 800a1fc166147207018f34a03883005f76a2910b (diff) | |
| download | dsub-0efd9216e71ddce379129811af9a6e4135776bbb.tar.gz dsub-0efd9216e71ddce379129811af9a6e4135776bbb.tar.bz2 dsub-0efd9216e71ddce379129811af9a6e4135776bbb.zip | |
Merge master into Fragments
Diffstat (limited to 'subsonic-android/res')
| -rw-r--r-- | subsonic-android/res/drawable/notification_stop.png | bin | 0 -> 338 bytes | |||
| -rw-r--r-- | subsonic-android/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | subsonic-android/res/xml/settings.xml | 6 |
3 files changed, 8 insertions, 0 deletions
diff --git a/subsonic-android/res/drawable/notification_stop.png b/subsonic-android/res/drawable/notification_stop.png Binary files differnew file mode 100644 index 00000000..ab98e188 --- /dev/null +++ b/subsonic-android/res/drawable/notification_stop.png diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml index dd27f426..3ab94f24 100644 --- a/subsonic-android/res/values/strings.xml +++ b/subsonic-android/res/values/strings.xml @@ -261,6 +261,8 @@ <string name="settings.temp_loss_pause_lower">Pause, lower volume when requested</string>
<string name="settings.temp_loss_lower">Always lower volume</string>
<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="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 30c5bfbc..a2ae7b20 100644 --- a/subsonic-android/res/xml/settings.xml +++ b/subsonic-android/res/xml/settings.xml @@ -182,6 +182,12 @@ android:defaultValue="1" android:entryValues="@array/tempLossValues" android:entries="@array/tempLossNames"/> + + <CheckBoxPreference + android:title="@string/settings.persistent_title" + android:summary="@string/settings.persistent_summary" + android:key="persistentNotification" + android:defaultValue="false"/> </PreferenceCategory> <PreferenceCategory |
