Migrate to AndroidXlineage-17.0

Change-Id: Ic9503cffe10a91a9aa07cc9e1537d883ee38c556

62 files changed, 214 insertions, 158 deletions

diff --git a/Android.mk b/Android.mk
index ef58cac..7633ce7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -9,16 +9,13 @@ LOCAL_SRC_FILES += $(call all-java-files-under, src_aosp)
 
 LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, res)
 
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    android-support-v8-renderscript \
-    android-common
-
 LOCAL_STATIC_ANDROID_LIBRARIES := \
-    android-support-v4 \
-    android-support-v7-appcompat \
-    android-support-v7-cardview \
-    android-support-v7-palette \
-    android-support-v7-recyclerview
+    androidx.appcompat_appcompat \
+    androidx.cardview_cardview \
+    androidx.core_core \
+    androidx.legacy_legacy-support-v4 \
+    androidx.palette_palette \
+    androidx.recyclerview_recyclerview
 
 LOCAL_USE_AAPT2 := true
 
diff --git a/build.gradle b/build.gradle
index ef89a61..dfc9958 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,7 +31,7 @@ task updateGradleWrapper(type: Wrapper) {
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -42,7 +42,7 @@ android {
         applicationId "org.lineageos.eleven"
 
         minSdkVersion 26
-        targetSdkVersion 28
+        targetSdkVersion 29
 
         versionCode 3
         versionName '3.0'
@@ -121,10 +121,11 @@ android {
 }
 
 dependencies {
-    // see https://developer.android.com/topic/libraries/support-library/revisions.html
-    implementation "com.android.support:appcompat-v7:28.0.0"
-    implementation "com.android.support:cardview-v7:28.0.0"
-    implementation "com.android.support:palette-v7:28.0.0"
-    implementation "com.android.support:recyclerview-v7:28.0.0"
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.core:core:1.1.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.palette:palette:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
 }
 
diff --git a/res/layout/artist_detail_album.xml b/res/layout/artist_detail_album.xml
index 3e7832b..dbe0fe1 100644
--- a/res/layout/artist_detail_album.xml
+++ b/res/layout/artist_detail_album.xml
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<android.support.v7.widget.CardView
+<androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_width="156dp"
@@ -78,4 +78,4 @@
 
     </RelativeLayout>
 
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>
diff --git a/res/layout/artist_detail_header.xml b/res/layout/artist_detail_header.xml
index 3bdff8d..bba20ca 100644
--- a/res/layout/artist_detail_header.xml
+++ b/res/layout/artist_detail_header.xml
@@ -21,7 +21,7 @@
         android:textSize="@dimen/text_size_medium"
         android:text="@string/header_albums" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/albums"
         android:scrollbars="none"
         android:layout_width="match_parent"
diff --git a/res/layout/fragment_music_browser_phone.xml b/res/layout/fragment_music_browser_phone.xml
index 9f69b23..a508c8b 100644
--- a/res/layout/fragment_music_browser_phone.xml
+++ b/res/layout/fragment_music_browser_phone.xml
@@ -31,7 +31,7 @@
             android:elevation="@dimen/action_bar_elevation"
             style="@style/HeaderTabTextStyle" />
 
-        <android.support.v4.view.ViewPager
+        <androidx.viewpager.widget.ViewPager
             android:id="@+id/fragment_home_phone_pager"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/res/layout/grid_items_normal.xml b/res/layout/grid_items_normal.xml
index fb04756..ab5749b 100644
--- a/res/layout/grid_items_normal.xml
+++ b/res/layout/grid_items_normal.xml
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<android.support.v7.widget.CardView
+<androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -74,4 +74,4 @@
 
     </LinearLayout>
 
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>
diff --git a/res/layout/main_playback_controls.xml b/res/layout/main_playback_controls.xml
index 61f4ec4..010d463 100644
--- a/res/layout/main_playback_controls.xml
+++ b/res/layout/main_playback_controls.xml
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<android.support.v7.widget.CardView
+<androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
@@ -141,4 +141,4 @@
         </RelativeLayout>
 
     </RelativeLayout>
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>
diff --git a/src/org/lineageos/eleven/MediaButtonIntentReceiver.java b/src/org/lineageos/eleven/MediaButtonIntentReceiver.java
index bd1a55a..d091552 100644
--- a/src/org/lineageos/eleven/MediaButtonIntentReceiver.java
+++ b/src/org/lineageos/eleven/MediaButtonIntentReceiver.java
@@ -14,10 +14,11 @@ package org.lineageos.eleven;
 import android.content.Context;
 import android.content.Intent;
 import android.media.AudioManager;
-import android.support.v4.content.WakefulBroadcastReceiver;
 import android.util.Log;
 import android.view.KeyEvent;
 
+import androidx.legacy.content.WakefulBroadcastReceiver;
+
 public class MediaButtonIntentReceiver extends WakefulBroadcastReceiver {
     private static final boolean DEBUG = false;
     private static final String TAG = "MediaButtonIntentReceiver";
diff --git a/src/org/lineageos/eleven/MusicPlaybackService.java b/src/org/lineageos/eleven/MusicPlaybackService.java
index 3283f0a..afd5856 100644
--- a/src/org/lineageos/eleven/MusicPlaybackService.java
+++ b/src/org/lineageos/eleven/MusicPlaybackService.java
@@ -56,13 +56,14 @@ import android.os.SystemClock;
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio.AlbumColumns;
 import android.provider.MediaStore.Audio.AudioColumns;
-import android.support.annotation.NonNull;
-import android.support.v4.os.BuildCompat;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.LongSparseArray;
 import android.view.KeyEvent;
 
+import androidx.annotation.NonNull;
+import androidx.core.os.BuildCompat;
+
 import org.lineageos.eleven.Config.IdType;
 import org.lineageos.eleven.appwidgets.AppWidgetLarge;
 import org.lineageos.eleven.appwidgets.AppWidgetLargeAlternate;
diff --git a/src/org/lineageos/eleven/adapters/AlbumArtPagerAdapter.java b/src/org/lineageos/eleven/adapters/AlbumArtPagerAdapter.java
index 166f148..117a6ff 100644
--- a/src/org/lineageos/eleven/adapters/AlbumArtPagerAdapter.java
+++ b/src/org/lineageos/eleven/adapters/AlbumArtPagerAdapter.java
@@ -19,14 +19,15 @@ package org.lineageos.eleven.adapters;
 import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+
 import org.lineageos.eleven.BuildConstants;
 import org.lineageos.eleven.MusicPlaybackService;
 import org.lineageos.eleven.R;
@@ -41,7 +42,7 @@ import java.util.Iterator;
 import java.util.LinkedList;
 
 /**
- * A {@link android.support.v4.app.FragmentStatePagerAdapter} class for swiping between album art
+ * A {@link androidx.fragment.app.FragmentStatePagerAdapter} class for swiping between album art
  */
 public class AlbumArtPagerAdapter extends FragmentStatePagerAdapter {
     private static boolean DEBUG = false;
diff --git a/src/org/lineageos/eleven/adapters/AlbumDetailSongAdapter.java b/src/org/lineageos/eleven/adapters/AlbumDetailSongAdapter.java
index 8f6fc34..20efebc 100644
--- a/src/org/lineageos/eleven/adapters/AlbumDetailSongAdapter.java
+++ b/src/org/lineageos/eleven/adapters/AlbumDetailSongAdapter.java
@@ -18,10 +18,11 @@ package org.lineageos.eleven.adapters;
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.content.Loader;
 import android.view.View;
 import android.widget.TextView;
 
+import androidx.loader.content.Loader;
+
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.cache.ImageFetcher;
diff --git a/src/org/lineageos/eleven/adapters/ArtistDetailAlbumAdapter.java b/src/org/lineageos/eleven/adapters/ArtistDetailAlbumAdapter.java
index 66fec09..b73912a 100644
--- a/src/org/lineageos/eleven/adapters/ArtistDetailAlbumAdapter.java
+++ b/src/org/lineageos/eleven/adapters/ArtistDetailAlbumAdapter.java
@@ -17,15 +17,16 @@ package org.lineageos.eleven.adapters;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v4.app.LoaderManager.LoaderCallbacks;
-import android.support.v4.content.Loader;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.recyclerview.widget.RecyclerView;
+
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.cache.ImageFetcher;
@@ -41,7 +42,7 @@ import java.util.List;
 
 public class ArtistDetailAlbumAdapter
 extends RecyclerView.Adapter<ArtistDetailAlbumAdapter.ViewHolder>
-implements LoaderCallbacks<List<Album>>, IPopupMenuCallback {
+implements LoaderManager.LoaderCallbacks<List<Album>>, IPopupMenuCallback {
     private static final int TYPE_FIRST = 1;
     private static final int TYPE_MIDDLE = 2;
     private static final int TYPE_LAST = 3;
diff --git a/src/org/lineageos/eleven/adapters/ArtistDetailSongAdapter.java b/src/org/lineageos/eleven/adapters/ArtistDetailSongAdapter.java
index c55025b..b7599dc 100644
--- a/src/org/lineageos/eleven/adapters/ArtistDetailSongAdapter.java
+++ b/src/org/lineageos/eleven/adapters/ArtistDetailSongAdapter.java
@@ -18,11 +18,12 @@ package org.lineageos.eleven.adapters;
 import android.app.Activity;
 import android.os.Bundle;
 import android.provider.MediaStore;
-import android.support.v4.content.Loader;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.loader.content.Loader;
+
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.cache.ImageFetcher;
diff --git a/src/org/lineageos/eleven/adapters/DetailSongAdapter.java b/src/org/lineageos/eleven/adapters/DetailSongAdapter.java
index 697a9dd..80771b6 100644
--- a/src/org/lineageos/eleven/adapters/DetailSongAdapter.java
+++ b/src/org/lineageos/eleven/adapters/DetailSongAdapter.java
@@ -1,8 +1,6 @@
 package org.lineageos.eleven.adapters;
 
 import android.app.Activity;
-import android.support.v4.app.LoaderManager.LoaderCallbacks;
-import android.support.v4.content.Loader;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -12,6 +10,9 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.cache.ImageFetcher;
@@ -25,8 +26,8 @@ import org.lineageos.eleven.widgets.PopupMenuButton;
 import java.util.Collections;
 import java.util.List;
 
-public abstract class DetailSongAdapter extends BaseAdapter
-        implements LoaderCallbacks<List<Song>>, OnItemClickListener, IPopupMenuCallback {
+public abstract class DetailSongAdapter extends BaseAdapter implements
+        LoaderManager.LoaderCallbacks<List<Song>>, OnItemClickListener, IPopupMenuCallback {
     protected final Activity mActivity;
     private final ImageFetcher mImageFetcher;
     private final LayoutInflater mInflater;
diff --git a/src/org/lineageos/eleven/adapters/PagerAdapter.java b/src/org/lineageos/eleven/adapters/PagerAdapter.java
index 05571bc..d4e9092 100644
--- a/src/org/lineageos/eleven/adapters/PagerAdapter.java
+++ b/src/org/lineageos/eleven/adapters/PagerAdapter.java
@@ -15,12 +15,13 @@ package org.lineageos.eleven.adapters;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
 import android.util.SparseArray;
 import android.view.ViewGroup;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.ui.fragments.AlbumFragment;
 import org.lineageos.eleven.ui.fragments.ArtistFragment;
diff --git a/src/org/lineageos/eleven/cache/BlurBitmapWorkerTask.java b/src/org/lineageos/eleven/cache/BlurBitmapWorkerTask.java
index b571571..1e922d4 100644
--- a/src/org/lineageos/eleven/cache/BlurBitmapWorkerTask.java
+++ b/src/org/lineageos/eleven/cache/BlurBitmapWorkerTask.java
@@ -19,10 +19,10 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.TransitionDrawable;
-import android.support.v8.renderscript.Allocation;
-import android.support.v8.renderscript.Element;
-import android.support.v8.renderscript.RenderScript;
-import android.support.v8.renderscript.ScriptIntrinsicBlur;
+import android.renderscript.Allocation;
+import android.renderscript.Element;
+import android.renderscript.RenderScript;
+import android.renderscript.ScriptIntrinsicBlur;
 import android.util.Log;
 import android.widget.ImageView;
 
diff --git a/src/org/lineageos/eleven/cache/ImageWorker.java b/src/org/lineageos/eleven/cache/ImageWorker.java
index 0e0d616..686cb9c 100644
--- a/src/org/lineageos/eleven/cache/ImageWorker.java
+++ b/src/org/lineageos/eleven/cache/ImageWorker.java
@@ -21,7 +21,7 @@ import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.TransitionDrawable;
-import android.support.v8.renderscript.RenderScript;
+import android.renderscript.RenderScript;
 import android.view.View;
 import android.widget.ImageView;
 
diff --git a/src/org/lineageos/eleven/loaders/WrappedAsyncTaskLoader.java b/src/org/lineageos/eleven/loaders/WrappedAsyncTaskLoader.java
index de4271e..b378b7a 100644
--- a/src/org/lineageos/eleven/loaders/WrappedAsyncTaskLoader.java
+++ b/src/org/lineageos/eleven/loaders/WrappedAsyncTaskLoader.java
@@ -2,7 +2,8 @@
 package org.lineageos.eleven.loaders;
 
 import android.content.Context;
-import android.support.v4.content.AsyncTaskLoader;
+
+import androidx.loader.content.AsyncTaskLoader;
 
 /**
  * <a href="http://code.google.com/p/android/issues/detail?id=14944">Issue
diff --git a/src/org/lineageos/eleven/locale/LocaleSet.java b/src/org/lineageos/eleven/locale/LocaleSet.java
index 0b0f3b0..4d75d0f 100644
--- a/src/org/lineageos/eleven/locale/LocaleSet.java
+++ b/src/org/lineageos/eleven/locale/LocaleSet.java
@@ -16,8 +16,10 @@
 
 package org.lineageos.eleven.locale;
 
-import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
+
+import androidx.annotation.VisibleForTesting;
+
 import java.util.Locale;
 
 public class LocaleSet {
diff --git a/src/org/lineageos/eleven/locale/LocaleSetManager.java b/src/org/lineageos/eleven/locale/LocaleSetManager.java
index 18b9e86..8213296 100644
--- a/src/org/lineageos/eleven/locale/LocaleSetManager.java
+++ b/src/org/lineageos/eleven/locale/LocaleSetManager.java
@@ -17,11 +17,12 @@
 package org.lineageos.eleven.locale;
 
 import android.content.Context;
-import android.support.annotation.VisibleForTesting;
 import android.os.Build;
 import android.text.TextUtils;
 import android.util.Log;
 
+import androidx.annotation.VisibleForTesting;
+
 import org.lineageos.eleven.provider.PropertiesStore;
 
 import java.util.Locale;
diff --git a/src/org/lineageos/eleven/locale/LocaleUtils.java b/src/org/lineageos/eleven/locale/LocaleUtils.java
index 21c1613..60f038a 100644
--- a/src/org/lineageos/eleven/locale/LocaleUtils.java
+++ b/src/org/lineageos/eleven/locale/LocaleUtils.java
@@ -17,9 +17,10 @@
 package org.lineageos.eleven.locale;
 
 import android.icu.text.AlphabeticIndex;
-import android.support.annotation.VisibleForTesting;
 import android.util.Log;
 
+import androidx.annotation.VisibleForTesting;
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Locale;
diff --git a/src/org/lineageos/eleven/menu/BasePlaylistDialog.java b/src/org/lineageos/eleven/menu/BasePlaylistDialog.java
index 887abea..44866bb 100644
--- a/src/org/lineageos/eleven/menu/BasePlaylistDialog.java
+++ b/src/org/lineageos/eleven/menu/BasePlaylistDialog.java
@@ -18,7 +18,6 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextWatcher;
@@ -26,6 +25,8 @@ import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.EditText;
 
+import androidx.fragment.app.DialogFragment;
+
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.utils.MusicUtils;
 
diff --git a/src/org/lineageos/eleven/menu/ConfirmDialog.java b/src/org/lineageos/eleven/menu/ConfirmDialog.java
index 293b59a..befbc78 100644
--- a/src/org/lineageos/eleven/menu/ConfirmDialog.java
+++ b/src/org/lineageos/eleven/menu/ConfirmDialog.java
@@ -21,8 +21,9 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
+
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
 
 import org.lineageos.eleven.R;
 
diff --git a/src/org/lineageos/eleven/menu/DeleteDialog.java b/src/org/lineageos/eleven/menu/DeleteDialog.java
index 65c4cbd..0ca366b 100644
--- a/src/org/lineageos/eleven/menu/DeleteDialog.java
+++ b/src/org/lineageos/eleven/menu/DeleteDialog.java
@@ -18,7 +18,8 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+
+import androidx.fragment.app.DialogFragment;
 
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.R;
diff --git a/src/org/lineageos/eleven/menu/PhotoSelectionDialog.java b/src/org/lineageos/eleven/menu/PhotoSelectionDialog.java
index 1d1cc3b..d29e3e6 100644
--- a/src/org/lineageos/eleven/menu/PhotoSelectionDialog.java
+++ b/src/org/lineageos/eleven/menu/PhotoSelectionDialog.java
@@ -17,10 +17,11 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
 import android.widget.ArrayAdapter;
 import android.widget.ListAdapter;
 
+import androidx.fragment.app.DialogFragment;
+
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.ui.activities.HomeActivity;
diff --git a/src/org/lineageos/eleven/model/Playlist.java b/src/org/lineageos/eleven/model/Playlist.java
index 60b2145..a8507db 100644
--- a/src/org/lineageos/eleven/model/Playlist.java
+++ b/src/org/lineageos/eleven/model/Playlist.java
@@ -18,9 +18,10 @@
 
 package org.lineageos.eleven.model;
 
-import android.support.annotation.NonNull;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+
 import java.util.Comparator;
 
 /**
diff --git a/src/org/lineageos/eleven/slidinguppanel/SlidingUpPanelLayout.java b/src/org/lineageos/eleven/slidinguppanel/SlidingUpPanelLayout.java
index d2b48df..623be54 100644
--- a/src/org/lineageos/eleven/slidinguppanel/SlidingUpPanelLayout.java
+++ b/src/org/lineageos/eleven/slidinguppanel/SlidingUpPanelLayout.java
@@ -10,14 +10,16 @@ import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.v4.view.MotionEventCompat;
-import android.support.v4.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityEvent;
+
+import androidx.core.view.MotionEventCompat;
+import androidx.core.view.ViewCompat;
+
 import org.lineageos.eleven.R;
 
 public class SlidingUpPanelLayout extends ViewGroup {
diff --git a/src/org/lineageos/eleven/slidinguppanel/ViewDragHelper.java b/src/org/lineageos/eleven/slidinguppanel/ViewDragHelper.java
index 42724eb..39497c9 100644
--- a/src/org/lineageos/eleven/slidinguppanel/ViewDragHelper.java
+++ b/src/org/lineageos/eleven/slidinguppanel/ViewDragHelper.java
@@ -20,10 +20,6 @@ package org.lineageos.eleven.slidinguppanel;
 import java.util.Arrays;
 
 import android.content.Context;
-import android.support.v4.view.MotionEventCompat;
-import android.support.v4.view.VelocityTrackerCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.widget.ScrollerCompat;
 import android.view.MotionEvent;
 import android.view.VelocityTracker;
 import android.view.View;
@@ -31,6 +27,11 @@ import android.view.ViewConfiguration;
 import android.view.ViewGroup;
 import android.view.animation.Interpolator;
 
+import androidx.core.view.MotionEventCompat;
+import androidx.core.view.VelocityTrackerCompat;
+import androidx.core.view.ViewCompat;
+import androidx.core.widget.ScrollerCompat;
+
 /**
  * ViewDragHelper is a utility class for writing custom ViewGroups. It offers a number
  * of useful operations and state tracking for allowing a user to drag and reposition
diff --git a/src/org/lineageos/eleven/ui/HeaderBar.java b/src/org/lineageos/eleven/ui/HeaderBar.java
index c8f3b18..6792a25 100644
--- a/src/org/lineageos/eleven/ui/HeaderBar.java
+++ b/src/org/lineageos/eleven/ui/HeaderBar.java
@@ -16,7 +16,6 @@
 package org.lineageos.eleven.ui;
 
 import android.content.Context;
-import android.support.v4.app.Fragment;
 import android.util.AttributeSet;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -27,6 +26,8 @@ import android.widget.LinearLayout;
 import android.widget.PopupMenu;
 import android.widget.TextView;
 
+import androidx.fragment.app.Fragment;
+
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.loaders.NowPlayingCursor;
 import org.lineageos.eleven.loaders.QueueLoader;
diff --git a/src/org/lineageos/eleven/ui/activities/BaseActivity.java b/src/org/lineageos/eleven/ui/activities/BaseActivity.java
index 9c2a2a6..e46cef0 100644
--- a/src/org/lineageos/eleven/ui/activities/BaseActivity.java
+++ b/src/org/lineageos/eleven/ui/activities/BaseActivity.java
@@ -13,8 +13,6 @@
 
 package org.lineageos.eleven.ui.activities;
 
-import static org.lineageos.eleven.utils.MusicUtils.mService;
-
 import android.app.ActionBar;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -27,7 +25,6 @@ import android.graphics.drawable.Drawable;
 import android.media.AudioManager;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.support.v4.app.FragmentActivity;
 import android.util.TypedValue;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -37,6 +34,8 @@ import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.Toolbar;
 
+import androidx.fragment.app.FragmentActivity;
+
 import org.lineageos.eleven.IElevenService;
 import org.lineageos.eleven.MusicPlaybackService;
 import org.lineageos.eleven.MusicStateListener;
@@ -53,6 +52,8 @@ import org.lineageos.eleven.widgets.PlayPauseProgressButton;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 
+import static org.lineageos.eleven.utils.MusicUtils.mService;
+
 /**
  * A base {@link FragmentActivity} used to update the bottom bar and
  * bind to Eleven's service.
diff --git a/src/org/lineageos/eleven/ui/activities/HomeActivity.java b/src/org/lineageos/eleven/ui/activities/HomeActivity.java
index 4ad5a49..7987576 100644
--- a/src/org/lineageos/eleven/ui/activities/HomeActivity.java
+++ b/src/org/lineageos/eleven/ui/activities/HomeActivity.java
@@ -24,18 +24,18 @@ import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.MediaStore;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.Window;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.cache.ImageFetcher;
diff --git a/src/org/lineageos/eleven/ui/activities/SearchActivity.java b/src/org/lineageos/eleven/ui/activities/SearchActivity.java
index 0f767c8..940be53 100644
--- a/src/org/lineageos/eleven/ui/activities/SearchActivity.java
+++ b/src/org/lineageos/eleven/ui/activities/SearchActivity.java
@@ -26,9 +26,6 @@ import android.os.Handler;
 import android.os.IBinder;
 import android.provider.BaseColumns;
 import android.provider.MediaStore;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.LoaderManager.LoaderCallbacks;
-import android.support.v4.content.Loader;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -46,6 +43,10 @@ import android.widget.ListView;
 import android.widget.SearchView;
 import android.widget.SearchView.OnQueryTextListener;
 
+import androidx.fragment.app.FragmentActivity;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.IElevenService;
 import org.lineageos.eleven.R;
@@ -86,7 +87,7 @@ import static org.lineageos.eleven.utils.MusicUtils.mService;
  * @author Andrew Neal (andrewdneal@gmail.com)
  */
 public class SearchActivity extends FragmentActivity implements
-        LoaderCallbacks<SectionListContainer<SearchResult>>,
+        LoaderManager.LoaderCallbacks<SectionListContainer<SearchResult>>,
         OnScrollListener, OnQueryTextListener, OnItemClickListener, ServiceConnection,
         OnTouchListener {
     /**
@@ -940,7 +941,7 @@ public class SearchActivity extends FragmentActivity implements
     /**
      * This handles the Loader callbacks for the search history
      */
-    public class SearchHistoryCallback implements LoaderCallbacks<ArrayAdapter<String>> {
+    public class SearchHistoryCallback implements LoaderManager.LoaderCallbacks<ArrayAdapter<String>> {
         @Override
         public Loader<ArrayAdapter<String>> onCreateLoader(int i, Bundle bundle) {
             // prep the loader in case the query takes a long time
diff --git a/src/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java b/src/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java
index 0417d36..53f73af 100644
--- a/src/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java
+++ b/src/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java
@@ -15,11 +15,12 @@ package org.lineageos.eleven.ui.activities;
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewPager;
 import android.view.View;
 import android.widget.LinearLayout;
 
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
+
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.slidinguppanel.SlidingUpPanelLayout;
 import org.lineageos.eleven.slidinguppanel.SlidingUpPanelLayout.SimplePanelSlideListener;
diff --git a/src/org/lineageos/eleven/ui/fragments/AlbumDetailFragment.java b/src/org/lineageos/eleven/ui/fragments/AlbumDetailFragment.java
index 826fbf0..f81aed8 100644
--- a/src/org/lineageos/eleven/ui/fragments/AlbumDetailFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/AlbumDetailFragment.java
@@ -16,11 +16,13 @@
 package org.lineageos.eleven.ui.fragments;
 
 import android.os.Bundle;
-import android.support.v4.app.LoaderManager;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
+
+import androidx.loader.app.LoaderManager;
+
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.adapters.AlbumDetailSongAdapter;
diff --git a/src/org/lineageos/eleven/ui/fragments/AlbumFragment.java b/src/org/lineageos/eleven/ui/fragments/AlbumFragment.java
index 5969575..f25f70a 100644
--- a/src/org/lineageos/eleven/ui/fragments/AlbumFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/AlbumFragment.java
@@ -15,8 +15,6 @@ package org.lineageos.eleven.ui.fragments;
 
 import android.os.Bundle;
 import android.os.SystemClock;
-import android.support.v4.app.LoaderManager.LoaderCallbacks;
-import android.support.v4.content.Loader;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -26,6 +24,9 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.GridView;
 
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+
 import org.lineageos.eleven.MusicStateListener;
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.adapters.AlbumAdapter;
@@ -51,7 +52,7 @@ import org.lineageos.eleven.widgets.LoadingEmptyContainer;
  * @author Andrew Neal (andrewdneal@gmail.com)
  */
 public class AlbumFragment extends MusicBrowserFragment implements
-        LoaderCallbacks<SectionListContainer<Album>>, OnScrollListener,
+        LoaderManager.LoaderCallbacks<SectionListContainer<Album>>, OnScrollListener,
         OnItemClickListener, MusicStateListener {
 
     /**
diff --git a/src/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java b/src/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java
index f346033..a47b312 100644
--- a/src/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java
@@ -16,14 +16,16 @@
 package org.lineageos.eleven.ui.fragments;
 
 import android.os.Bundle;
-import android.support.v4.app.LoaderManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewTreeObserver;
 import android.widget.ImageView;
 import android.widget.ListView;
+
+import androidx.loader.app.LoaderManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.adapters.ArtistDetailAlbumAdapter;
diff --git a/src/org/lineageos/eleven/ui/fragments/ArtistFragment.java b/src/org/lineageos/eleven/ui/fragments/ArtistFragment.java
index 14f85e6..b142af8 100644
--- a/src/org/lineageos/eleven/ui/fragments/ArtistFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/ArtistFragment.java
@@ -16,9 +16,6 @@ package org.lineageos.eleven.ui.fragments;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.SystemClock;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.LoaderManager.LoaderCallbacks;
-import android.support.v4.content.Loader;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -28,6 +25,10 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 
+import androidx.fragment.app.Fragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+
 import org.lineageos.eleven.MusicStateListener;
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.adapters.ArtistAdapter;
@@ -55,7 +56,7 @@ import org.lineageos.eleven.widgets.LoadingEmptyContainer;
  * @author Andrew Neal (andrewdneal@gmail.com)
  */
 public class ArtistFragment extends MusicBrowserFragment implements
-        LoaderCallbacks<SectionListContainer<Artist>>,
+        LoaderManager.LoaderCallbacks<SectionListContainer<Artist>>,
         OnScrollListener, OnItemClickListener, MusicStateListener {
 
     /**
diff --git a/src/org/lineageos/eleven/ui/fragments/AudioPlayerFragment.java b/src/org/lineageos/eleven/ui/fragments/AudioPlayerFragment.java
index 52a8385..6a39df7 100644
--- a/src/org/lineageos/eleven/ui/fragments/AudioPlayerFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/AudioPlayerFragment.java
@@ -28,8 +28,6 @@ import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
 import android.os.PowerManager;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewPager;
 import android.text.Html;
 import android.text.Spanned;
 import android.text.TextUtils;
@@ -46,6 +44,9 @@ import android.widget.ImageView;
 import android.widget.PopupMenu;
 import android.widget.TextView;
 
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
+
 import org.lineageos.eleven.MusicPlaybackService;
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.adapters.AlbumArtPagerAdapter;
diff --git a/src/org/lineageos/eleven/ui/fragments/BaseFragment.java b/src/org/lineageos/eleven/ui/fragments/BaseFragment.java
index e0c90d2..6fa37ae 100644
--- a/src/org/lineageos/eleven/ui/fragments/BaseFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/BaseFragment.java
@@ -16,12 +16,13 @@
 package org.lineageos.eleven.ui.fragments;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.fragment.app.Fragment;
+
 import org.lineageos.eleven.MusicStateListener;
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.ui.activities.HomeActivity;
diff --git a/src/org/lineageos/eleven/ui/fragments/PlaylistDetailFragment.java b/src/org/lineageos/eleven/ui/fragments/PlaylistDetailFragment.java
index 2043444..cf160dc 100644
--- a/src/org/lineageos/eleven/ui/fragments/PlaylistDetailFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/PlaylistDetailFragment.java
@@ -19,15 +19,16 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.MediaStore;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.app.LoaderManager.LoaderCallbacks;
-import android.support.v4.content.Loader;
 import android.view.View;
 import android.widget.AbsListView;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ImageView;
 import android.widget.TextView;
+
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.adapters.PagerAdapter;
@@ -55,7 +56,7 @@ import java.util.List;
 import java.util.TreeSet;
 
 public class PlaylistDetailFragment extends FadingBarFragment implements
-        LoaderCallbacks<List<Song>>, OnItemClickListener, DropListener,
+        LoaderManager.LoaderCallbacks<List<Song>>, OnItemClickListener, DropListener,
         RemoveListener, DragScrollProfile, IChildFragment {
 
     /**
diff --git a/src/org/lineageos/eleven/ui/fragments/PlaylistFragment.java b/src/org/lineageos/eleven/ui/fragments/PlaylistFragment.java
index 3ce96f9..0d29bf6 100644
--- a/src/org/lineageos/eleven/ui/fragments/PlaylistFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/PlaylistFragment.java
@@ -19,10 +19,6 @@
 package org.lineageos.eleven.ui.fragments;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.LoaderManager.LoaderCallbacks;
-import android.support.v4.content.Loader;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -30,6 +26,11 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+
 import org.lineageos.eleven.Config.SmartPlaylistType;
 import org.lineageos.eleven.MusicStateListener;
 import org.lineageos.eleven.R;
@@ -56,7 +57,7 @@ import java.util.List;
  * @author Andrew Neal (andrewdneal@gmail.com)
  */
 public class PlaylistFragment extends MusicBrowserFragment implements
-        LoaderCallbacks<List<Playlist>>,
+        LoaderManager.LoaderCallbacks<List<Playlist>>,
         OnItemClickListener, MusicStateListener {
 
     /**
@@ -108,7 +109,7 @@ public class PlaylistFragment extends MusicBrowserFragment implements
 
     @Override
     public View onCreateView(@NonNull final LayoutInflater inflater, final ViewGroup container,
-            final Bundle savedInstanceState) {
+                             final Bundle savedInstanceState) {
         // The View for the fragment's UI
         final ViewGroup rootView = (ViewGroup) inflater.inflate(R.layout.list_base, container, false);
         // Initialize the list
diff --git a/src/org/lineageos/eleven/ui/fragments/QueueFragment.java b/src/org/lineageos/eleven/ui/fragments/QueueFragment.java
index 15c7f02..c958009 100644
--- a/src/org/lineageos/eleven/ui/fragments/QueueFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/QueueFragment.java
@@ -24,15 +24,16 @@ import android.content.ServiceConnection;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.provider.MediaStore;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.LoaderManager.LoaderCallbacks;
-import android.support.v4.content.Loader;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 
+import androidx.fragment.app.Fragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.MusicPlaybackService;
 import org.lineageos.eleven.R;
@@ -65,7 +66,7 @@ import java.util.TreeSet;
  *
  * @author Andrew Neal (andrewdneal@gmail.com)
  */
-public class QueueFragment extends Fragment implements LoaderCallbacks<List<Song>>,
+public class QueueFragment extends Fragment implements LoaderManager.LoaderCallbacks<List<Song>>,
         OnItemClickListener, DropListener, RemoveListener, DragScrollProfile, ServiceConnection {
 
     /**
diff --git a/src/org/lineageos/eleven/ui/fragments/RecentFragment.java b/src/org/lineageos/eleven/ui/fragments/RecentFragment.java
index b999359..0348bb9 100644
--- a/src/org/lineageos/eleven/ui/fragments/RecentFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/RecentFragment.java
@@ -15,11 +15,12 @@ package org.lineageos.eleven.ui.fragments;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v4.content.Loader;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.loader.content.Loader;
+
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.Config.SmartPlaylistType;
 import org.lineageos.eleven.R;
diff --git a/src/org/lineageos/eleven/ui/fragments/SongFragment.java b/src/org/lineageos/eleven/ui/fragments/SongFragment.java
index bd9a273..d124dea 100644
--- a/src/org/lineageos/eleven/ui/fragments/SongFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/SongFragment.java
@@ -15,8 +15,9 @@ package org.lineageos.eleven.ui.fragments;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
+
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
 
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.adapters.PagerAdapter;
diff --git a/src/org/lineageos/eleven/ui/fragments/phone/MusicBrowserFragment.java b/src/org/lineageos/eleven/ui/fragments/phone/MusicBrowserFragment.java
index caa2fc5..a0fe835 100644
--- a/src/org/lineageos/eleven/ui/fragments/phone/MusicBrowserFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/phone/MusicBrowserFragment.java
@@ -1,24 +1,24 @@
 /*
-* Copyright (C) 2014 The CyanogenMod Project
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Copyright (C) 2014 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.lineageos.eleven.ui.fragments.phone;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.app.LoaderManager.LoaderCallbacks;
+
+import androidx.fragment.app.Fragment;
+import androidx.loader.app.LoaderManager;
 
 /**
  * This class is used for fragments under the {@link MusicBrowserFragment}
@@ -33,11 +33,13 @@ public abstract class MusicBrowserFragment extends Fragment {
         return getParentFragment().getLoaderManager();
     }
 
-    protected void initLoader(Bundle args, LoaderCallbacks<? extends Object> callback) {
+    protected void initLoader(Bundle args,
+            LoaderManager.LoaderCallbacks<? extends Object> callback) {
         getContainingLoaderManager().initLoader(getLoaderId(), args, callback);
     }
 
-    protected void restartLoader(Bundle args, LoaderCallbacks<? extends Object> callback) {
+    protected void restartLoader(Bundle args,
+            LoaderManager.LoaderCallbacks<? extends Object> callback) {
         getContainingLoaderManager().restartLoader(getLoaderId(), args, callback);
     }
 }
diff --git a/src/org/lineageos/eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java b/src/org/lineageos/eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java
index a93a85d..1237e79 100644
--- a/src/org/lineageos/eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java
@@ -14,12 +14,13 @@
 package org.lineageos.eleven.ui.fragments.phone;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewPager;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
+
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.adapters.PagerAdapter;
 import org.lineageos.eleven.adapters.PagerAdapter.MusicFragments;
diff --git a/src/org/lineageos/eleven/ui/fragments/profile/BasicSongFragment.java b/src/org/lineageos/eleven/ui/fragments/profile/BasicSongFragment.java
index 4e352cc..5ef709d 100644
--- a/src/org/lineageos/eleven/ui/fragments/profile/BasicSongFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/profile/BasicSongFragment.java
@@ -15,10 +15,6 @@ package org.lineageos.eleven.ui.fragments.profile;
 
 import android.os.Bundle;
 import android.os.SystemClock;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.app.LoaderManager.LoaderCallbacks;
-import android.support.v4.content.Loader;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -27,6 +23,10 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 
+import androidx.fragment.app.Fragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.MusicStateListener;
 import org.lineageos.eleven.R;
@@ -52,7 +52,8 @@ import java.util.TreeSet;
  * @author Andrew Neal (andrewdneal@gmail.com)
  */
 public abstract class BasicSongFragment extends Fragment implements
-        LoaderCallbacks<SectionListContainer<Song>>, OnItemClickListener, MusicStateListener {
+        LoaderManager.LoaderCallbacks<SectionListContainer<Song>>,
+        OnItemClickListener, MusicStateListener {
 
     /**
      * Fragment UI
diff --git a/src/org/lineageos/eleven/ui/fragments/profile/LastAddedFragment.java b/src/org/lineageos/eleven/ui/fragments/profile/LastAddedFragment.java
index b63ba52..f2a97ff 100644
--- a/src/org/lineageos/eleven/ui/fragments/profile/LastAddedFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/profile/LastAddedFragment.java
@@ -14,11 +14,12 @@
 package org.lineageos.eleven.ui.fragments.profile;
 
 import android.os.Bundle;
-import android.support.v4.content.Loader;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.loader.content.Loader;
+
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.Config.SmartPlaylistType;
 import org.lineageos.eleven.R;
diff --git a/src/org/lineageos/eleven/ui/fragments/profile/TopTracksFragment.java b/src/org/lineageos/eleven/ui/fragments/profile/TopTracksFragment.java
index 191ddb1..62f3cba 100644
--- a/src/org/lineageos/eleven/ui/fragments/profile/TopTracksFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/profile/TopTracksFragment.java
@@ -15,12 +15,13 @@ package org.lineageos.eleven.ui.fragments.profile;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v4.content.Loader;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.loader.content.Loader;
+
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.Config.SmartPlaylistType;
 import org.lineageos.eleven.R;
diff --git a/src/org/lineageos/eleven/utils/AlbumPopupMenuHelper.java b/src/org/lineageos/eleven/utils/AlbumPopupMenuHelper.java
index d565b50..6774fbb 100644
--- a/src/org/lineageos/eleven/utils/AlbumPopupMenuHelper.java
+++ b/src/org/lineageos/eleven/utils/AlbumPopupMenuHelper.java
@@ -17,9 +17,11 @@ package org.lineageos.eleven.utils;
 
 import android.app.Activity;
 import android.provider.MediaStore;
-import android.support.v4.app.FragmentManager;
 
 import android.view.MenuItem;
+
+import androidx.fragment.app.FragmentManager;
+
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.cache.ImageFetcher;
 import org.lineageos.eleven.menu.DeleteDialog;
diff --git a/src/org/lineageos/eleven/utils/ArtistPopupMenuHelper.java b/src/org/lineageos/eleven/utils/ArtistPopupMenuHelper.java
index 301acff..eafb062 100644
--- a/src/org/lineageos/eleven/utils/ArtistPopupMenuHelper.java
+++ b/src/org/lineageos/eleven/utils/ArtistPopupMenuHelper.java
@@ -16,9 +16,11 @@
 package org.lineageos.eleven.utils;
 
 import android.app.Activity;
-import android.support.v4.app.FragmentManager;
 
 import android.view.MenuItem;
+
+import androidx.fragment.app.FragmentManager;
+
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.menu.DeleteDialog;
 import org.lineageos.eleven.menu.FragmentMenuItems;
diff --git a/src/org/lineageos/eleven/utils/BitmapWithColors.java b/src/org/lineageos/eleven/utils/BitmapWithColors.java
index 721841a..c5241a2 100644
--- a/src/org/lineageos/eleven/utils/BitmapWithColors.java
+++ b/src/org/lineageos/eleven/utils/BitmapWithColors.java
@@ -18,9 +18,10 @@ package org.lineageos.eleven.utils;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.os.Looper;
-import android.support.v7.graphics.Palette;
 import android.util.LruCache;
 
+import androidx.palette.graphics.Palette;
+
 public class BitmapWithColors {
     private static final class BitmapColors {
         public final int mVibrantColor;
diff --git a/src/org/lineageos/eleven/utils/GenreFetcher.java b/src/org/lineageos/eleven/utils/GenreFetcher.java
index 416bbd0..f9896c1 100644
--- a/src/org/lineageos/eleven/utils/GenreFetcher.java
+++ b/src/org/lineageos/eleven/utils/GenreFetcher.java
@@ -4,15 +4,15 @@ import android.content.Context;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.provider.MediaStore;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.app.LoaderManager.LoaderCallbacks;
-import android.support.v4.content.CursorLoader;
-import android.support.v4.content.Loader;
 import android.view.View;
 import android.widget.TextView;
 
-public class GenreFetcher implements LoaderCallbacks<Cursor> {
+import androidx.fragment.app.FragmentActivity;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.CursorLoader;
+import androidx.loader.content.Loader;
+
+public class GenreFetcher implements LoaderManager.LoaderCallbacks<Cursor> {
     private static final String[] GENRE_PROJECTION = new String[] { MediaStore.Audio.Genres.NAME };
 
     private Context mContext;
diff --git a/src/org/lineageos/eleven/utils/IoUtils.java b/src/org/lineageos/eleven/utils/IoUtils.java
index dc50b89..b1319dc 100644
--- a/src/org/lineageos/eleven/utils/IoUtils.java
+++ b/src/org/lineageos/eleven/utils/IoUtils.java
@@ -16,7 +16,7 @@
  */
 package org.lineageos.eleven.utils;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.io.Closeable;
 import java.net.Socket;
diff --git a/src/org/lineageos/eleven/utils/MusicUtils.java b/src/org/lineageos/eleven/utils/MusicUtils.java
index 4d69cb2..a681b9d 100644
--- a/src/org/lineageos/eleven/utils/MusicUtils.java
+++ b/src/org/lineageos/eleven/utils/MusicUtils.java
@@ -42,11 +42,12 @@ import android.provider.MediaStore.Audio.Playlists;
 import android.provider.MediaStore.Audio.PlaylistsColumns;
 import android.provider.MediaStore.MediaColumns;
 import android.provider.Settings;
-import android.support.annotation.WorkerThread;
 import android.util.Log;
 import android.view.Menu;
 import android.widget.Toast;
 
+import androidx.annotation.WorkerThread;
+
 import org.lineageos.eleven.Config.IdType;
 import org.lineageos.eleven.Config.SmartPlaylistType;
 import org.lineageos.eleven.IElevenService;
diff --git a/src/org/lineageos/eleven/utils/PlaylistPopupMenuHelper.java b/src/org/lineageos/eleven/utils/PlaylistPopupMenuHelper.java
index cfebe91..984a41d 100644
--- a/src/org/lineageos/eleven/utils/PlaylistPopupMenuHelper.java
+++ b/src/org/lineageos/eleven/utils/PlaylistPopupMenuHelper.java
@@ -22,7 +22,8 @@ import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.net.Uri;
 import android.provider.MediaStore;
-import android.support.v4.app.FragmentManager;
+
+import androidx.fragment.app.FragmentManager;
 
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.Config.SmartPlaylistType;
diff --git a/src/org/lineageos/eleven/utils/PopupMenuHelper.java b/src/org/lineageos/eleven/utils/PopupMenuHelper.java
index 77dd78d..1cc6f72 100644
--- a/src/org/lineageos/eleven/utils/PopupMenuHelper.java
+++ b/src/org/lineageos/eleven/utils/PopupMenuHelper.java
@@ -18,12 +18,13 @@ package org.lineageos.eleven.utils;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
-import android.support.v4.app.FragmentManager;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.PopupMenu;
 
+import androidx.fragment.app.FragmentManager;
+
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.menu.CreateNewPlaylist;
diff --git a/src/org/lineageos/eleven/utils/SongPopupMenuHelper.java b/src/org/lineageos/eleven/utils/SongPopupMenuHelper.java
index 54f1e5a..df0a546 100644
--- a/src/org/lineageos/eleven/utils/SongPopupMenuHelper.java
+++ b/src/org/lineageos/eleven/utils/SongPopupMenuHelper.java
@@ -18,7 +18,8 @@ package org.lineageos.eleven.utils;
 
 import android.app.Activity;
 import android.provider.MediaStore;
-import android.support.v4.app.FragmentManager;
+
+import androidx.fragment.app.FragmentManager;
 
 import org.lineageos.eleven.menu.DeleteDialog;
 import org.lineageos.eleven.menu.FragmentMenuItems;
diff --git a/src/org/lineageos/eleven/widgets/AudioActivityButton.java b/src/org/lineageos/eleven/widgets/AudioActivityButton.java
index 483dbe8..fb76bf6 100644
--- a/src/org/lineageos/eleven/widgets/AudioActivityButton.java
+++ b/src/org/lineageos/eleven/widgets/AudioActivityButton.java
@@ -14,10 +14,12 @@
 * limitations under the License.
 */
 package org.lineageos.eleven.widgets;
+
 import android.content.Context;
-import android.support.v4.app.FragmentActivity;
 import android.util.AttributeSet;
 
+import androidx.fragment.app.FragmentActivity;
+
 import org.lineageos.eleven.ui.activities.SlidingPanelActivity;
 
 public abstract class AudioActivityButton extends AudioButton {
diff --git a/src/org/lineageos/eleven/widgets/LetterTileDrawable.java b/src/org/lineageos/eleven/widgets/LetterTileDrawable.java
index f2fe5b3..c44f0ad 100644
--- a/src/org/lineageos/eleven/widgets/LetterTileDrawable.java
+++ b/src/org/lineageos/eleven/widgets/LetterTileDrawable.java
@@ -28,9 +28,10 @@ import android.graphics.Paint.Align;
 import android.graphics.Rect;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
-import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 
+import androidx.core.content.ContextCompat;
+
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.cache.ImageWorker.ImageType;
 import org.lineageos.eleven.utils.BitmapWithColors;
diff --git a/src/org/lineageos/eleven/widgets/SquareViewPager.java b/src/org/lineageos/eleven/widgets/SquareViewPager.java
index a9900f6..6a793c8 100644
--- a/src/org/lineageos/eleven/widgets/SquareViewPager.java
+++ b/src/org/lineageos/eleven/widgets/SquareViewPager.java
@@ -16,9 +16,10 @@
 package org.lineageos.eleven.widgets;
 
 import android.content.Context;
-import android.support.v4.view.ViewPager;
 import android.util.AttributeSet;
 
+import androidx.viewpager.widget.ViewPager;
+
 /**
  * A custom {@link ViewPager} that is sized to be a perfect square, otherwise
  * functions like a typical {@link ViewPager}.
diff --git a/src/org/lineageos/eleven/widgets/ViewPagerTabs.java b/src/org/lineageos/eleven/widgets/ViewPagerTabs.java
index 10a7823..6fbb460 100644
--- a/src/org/lineageos/eleven/widgets/ViewPagerTabs.java
+++ b/src/org/lineageos/eleven/widgets/ViewPagerTabs.java
@@ -19,8 +19,6 @@ import android.content.Context;
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
 import android.graphics.Outline;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.Gravity;
@@ -32,6 +30,9 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
 import org.lineageos.eleven.R;
 
 /**