summaryrefslogtreecommitdiff
path: root/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
diff options
context:
space:
mode:
authorJonas Kalderstam <jonas@cowboyprogrammer.org>2019-10-05 01:18:14 +0200
committerJonas Kalderstam <jonas@cowboyprogrammer.org>2019-10-05 01:18:14 +0200
commit97aa36061186ae589b26e90939a32e83573368c2 (patch)
treeda900ade55ada0976017046c8ba0b7dd49937f9e /app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
parentde78c0e31eeff0609fe5388204e6e39e8f60579b (diff)
parenteb70b4e0fa48f72eef50b2ca55eb590ae5df5726 (diff)
downloadAntennaPod-97aa36061186ae589b26e90939a32e83573368c2.zip
Merge remote-tracking branch 'antennapod/develop' into per_feed_playbackspeed
Diffstat (limited to 'app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java')
-rw-r--r--app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
index 7e0ae173f..a0f9bf6d8 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
@@ -1,9 +1,9 @@
package de.danoeh.antennapod.activity;
import android.os.Bundle;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.preference.PreferenceFragmentCompat;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.preference.PreferenceFragmentCompat;
import android.view.Menu;
import android.view.MenuItem;
import android.view.ViewGroup;