diff options
| author | daniel oeh <daniel.oeh@gmail.com> | 2014-09-29 17:34:34 +0200 |
|---|---|---|
| committer | daniel oeh <daniel.oeh@gmail.com> | 2014-09-29 17:34:34 +0200 |
| commit | 441165ff3f8febb10e02338b634c0250e8734472 (patch) | |
| tree | 10f2b4b8e8e5ba046d3b96bca91aea8535ce3e77 /res | |
| parent | 24b49f1a13bf9b175c0b404f6f14ceb1fb4bb18e (diff) | |
| parent | ccb1b2522c6c4bd5b738dab1daa9aeff53b545fe (diff) | |
| download | AntennaPod-441165ff3f8febb10e02338b634c0250e8734472.zip | |
Merge branch 'mchelen-notifymore2' into develop
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 6 | ||||
| -rw-r--r-- | res/xml/preferences.xml | 12 |
2 files changed, 18 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index b5cc4ee86..6a62f5e14 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -90,6 +90,7 @@ <string name="download_label">Download</string> <string name="play_label">Play</string> <string name="pause_label">Pause</string> + <string name="stop_label">Stop</string> <string name="stream_label">Stream</string> <string name="remove_label">Remove</string> <string name="remove_episode_lable">Remove episode</string> @@ -250,6 +251,11 @@ <string name="pref_seek_delta_sum">Seek this many seconds when rewinding or fast-forwarding</string> <string name="pref_gpodnet_sethostname_title">Set hostname</string> <string name="pref_gpodnet_sethostname_use_default_host">Use default host</string> + <string name="pref_expandNotify_title">Expand Notification</string> + <string name="pref_expandNotify_sum">Always expand the notification to show playback buttons.</string> + <string name="pref_persistNotify_title">Persistent playback controls</string> + <string name="pref_persistNotify_sum">Keep notification and lockscreen controls when playback is paused.</string> + <string name="pref_expand_notify_unsupport_toast">Android versions before 4.1 do not support expanded notifications.</string> <!-- Auto-Flattr dialog --> <string name="auto_flattr_enable">Enable automatic flattring</string> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 470e1a1fe..5175acdcb 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -9,6 +9,18 @@ android:key="prefTheme" android:summary="@string/pref_set_theme_sum" android:defaultValue="0"/> + <CheckBoxPreference + android:defaultValue="false" + android:enabled="true" + android:key="prefExpandNotify" + android:summary="@string/pref_expandNotify_sum" + android:title="@string/pref_expandNotify_title"/> + <CheckBoxPreference + android:defaultValue="false" + android:enabled="true" + android:key="prefPersistNotify" + android:summary="@string/pref_persistNotify_sum" + android:title="@string/pref_persistNotify_title"/> </PreferenceCategory> <PreferenceCategory android:title="@string/playback_pref"> <CheckBoxPreference |