diff options
| author | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-09-17 18:54:21 -0400 |
|---|---|---|
| committer | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-09-17 18:54:21 -0400 |
| commit | 155eeb49b335c134bb971a921ce16a4eff208491 (patch) | |
| tree | 1215b80abf2abd50533b4d144e83aaa000df1912 /app/src | |
| parent | 8d4bdd5ba1a027a468e1a40eadc2b3ae6fc62faf (diff) | |
| parent | c34a2779bb0d9a1cd9faa285a1f3f8409255d9c7 (diff) | |
| download | AntennaPod-155eeb49b335c134bb971a921ce16a4eff208491.zip | |
Merge pull request #1204 from mfietz/media_session
Lockscreen background, media session and playback state
Diffstat (limited to 'app/src')
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/xml/preferences.xml | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 117a008a8..a94f9ff95 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -325,6 +325,11 @@ android:scheme="package"/> </intent-filter> </receiver> + <receiver android:name="de.danoeh.antennapod.core.service.playback.MediaButtonIntentReceiver"> + <intent-filter> + <action android:name="android.intent.action.MEDIA_BUTTON" /> + </intent-filter> + </receiver> <meta-data android:name="de.danoeh.antennapod.core.glide.ApGlideModule" diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 35fb60c58..c9be65f2b 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -47,6 +47,12 @@ <CheckBoxPreference android:defaultValue="true" android:enabled="true" + android:key="prefLockscreenBackground" + android:summary="@string/pref_lockscreen_background_sum" + android:title="@string/pref_lockscreen_background_title"/> + <CheckBoxPreference + android:defaultValue="true" + android:enabled="true" android:key="prefShowDownloadReport" android:summary="@string/pref_showDownloadReport_sum" android:title="@string/pref_showDownloadReport_title"/> |