diff options
| author | Max Bechtold <max.bechtold@andrena.de> | 2019-10-17 12:36:45 +0200 |
|---|---|---|
| committer | Max Bechtold <max.bechtold@andrena.de> | 2019-10-17 13:13:19 +0200 |
| commit | 87cca61dcd8337facf695f03f1330c55bfa85168 (patch) | |
| tree | 630888c57de93856f33184ec475f01716812deff /app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java | |
| parent | cc9c8bb63a27deb35f0e234d252e22a73ef6c117 (diff) | |
| parent | 2ffdc275b8dd127f15506556d1b7ba9fb9108b47 (diff) | |
| download | AntennaPod-87cca61dcd8337facf695f03f1330c55bfa85168.zip | |
Merge remote-tracking branch 'origin/develop' into feat/simple-adjust-volume-per-feed
Diffstat (limited to 'app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java')
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java index e2060481f..f9fca87fc 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java @@ -2,9 +2,9 @@ package de.danoeh.antennapod.fragment; import android.content.res.TypedArray; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.ListFragment; -import android.support.v4.view.MenuItemCompat; +import androidx.annotation.NonNull; +import androidx.fragment.app.ListFragment; +import androidx.core.view.MenuItemCompat; import android.util.Log; import android.view.Menu; import android.view.MenuInflater; |