summaryrefslogtreecommitdiff
path: root/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
diff options
context:
space:
mode:
authorMax Bechtold <max.bechtold@andrena.de>2019-10-17 12:36:45 +0200
committerMax Bechtold <max.bechtold@andrena.de>2019-10-17 13:13:19 +0200
commit87cca61dcd8337facf695f03f1330c55bfa85168 (patch)
tree630888c57de93856f33184ec475f01716812deff /app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
parentcc9c8bb63a27deb35f0e234d252e22a73ef6c117 (diff)
parent2ffdc275b8dd127f15506556d1b7ba9fb9108b47 (diff)
downloadAntennaPod-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/activity/OnlineFeedViewActivity.java')
-rw-r--r--app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
index 732570d8a..ede6e6962 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
@@ -7,12 +7,12 @@ import android.content.Intent;
import android.graphics.LightingColorFilter;
import android.os.Build;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.UiThread;
-import android.support.v4.app.NavUtils;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.UiThread;
+import androidx.core.app.NavUtils;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;