summaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
authorRoss Harrison <rtharrison86@gmail.com>2015-02-01 00:30:35 -0600
committerRoss Harrison <rtharrison86@gmail.com>2015-02-01 00:30:35 -0600
commitc11edda64cc8f308aaea7db41c6751189742bda1 (patch)
tree30187c1e6575e4cb34bd3f1a9c073e7694371694 /app/src
parent9659c18d899349d9be1573fb9520defc7d3a19cd (diff)
parent509b2a7f58390a740088fbc7904302ee99af9a42 (diff)
downloadAntennaPod-c11edda64cc8f308aaea7db41c6751189742bda1.zip
Merge pull request #1 from rharriso/feature/add_to_front_of_queue
Feature/add to front of queue
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java2
-rw-r--r--app/src/main/res/xml/preferences.xml14
2 files changed, 13 insertions, 3 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 41930a7f2..edaba5df3 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -58,8 +58,6 @@ public class PreferenceController {
public static final String PREF_GPODNET_LOGOUT = "pref_gpodnet_logout";
public static final String PREF_GPODNET_HOSTNAME = "pref_gpodnet_hostname";
public static final String PREF_EXPANDED_NOTIFICATION = "prefExpandNotify";
- private static final String PREF_PERSISTENT_NOTIFICATION = "prefPersistNotify";
-
private final PreferenceUI ui;
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 5175acdcb..8675e07d7 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -22,11 +22,22 @@
android:summary="@string/pref_persistNotify_sum"
android:title="@string/pref_persistNotify_title"/>
</PreferenceCategory>
+
+ <PreferenceCategory android:title="@string/queue_label">
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:enabled="true"
+ android:key="prefQueueAddToFront"
+ android:summary="@string/pref_queueAddToFront_sum"
+ android:title="@string/pref_queueAddToFront_title"/>
+ />
+ </PreferenceCategory>
+
<PreferenceCategory android:title="@string/playback_pref">
<CheckBoxPreference
android:defaultValue="true"
android:enabled="true"
- android:key="prefPauseOnHeadsetDisconnect"
+ android:key="prefPauseOnHeadsetDisconnec"
android:summary="@string/pref_pauseOnHeadsetDisconnect_sum"
android:title="@string/pref_pauseOnHeadsetDisconnect_title"/>
<CheckBoxPreference
@@ -93,6 +104,7 @@
</PreferenceScreen>
</PreferenceCategory>
+
<PreferenceCategory android:title="@string/services_label">
<PreferenceScreen
android:key="prefFlattrSettings"