diff --git a/api/build.gradle b/api/build.gradle
index 5f1a35acf..c44af1391 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -58,7 +58,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    api "com.android.support:appcompat-v7:$rootProject.ext.appCompatVersion"
+    api "androidx.appcompat:appcompat:$rootProject.ext.androidxVersion"
     testImplementation "junit:junit:$rootProject.ext.junitVersion"
 }
 
diff --git a/api/src/main/java/org/videolan/vlc/extensions/api/VLCExtensionService.java b/api/src/main/java/org/videolan/vlc/extensions/api/VLCExtensionService.java
index b931c8681..375a36f5b 100644
--- a/api/src/main/java/org/videolan/vlc/extensions/api/VLCExtensionService.java
+++ b/api/src/main/java/org/videolan/vlc/extensions/api/VLCExtensionService.java
@@ -32,8 +32,8 @@ import android.os.HandlerThread;
 import android.os.IBinder;
 import android.os.Looper;
 import android.os.RemoteException;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.List;
 
diff --git a/api/src/main/java/org/videolan/vlc/extensions/api/tools/Dialogs.java b/api/src/main/java/org/videolan/vlc/extensions/api/tools/Dialogs.java
index 543bfaac8..53ac31f19 100644
--- a/api/src/main/java/org/videolan/vlc/extensions/api/tools/Dialogs.java
+++ b/api/src/main/java/org/videolan/vlc/extensions/api/tools/Dialogs.java
@@ -28,9 +28,9 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 
 import org.videolan.vlc.plugin.api.R;
 
diff --git a/build.gradle b/build.gradle
index ad2cee71d..6acd647c3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,21 +24,22 @@ allprojects {
 }
 
 ext {
-    appCompatVersion = '28.0.0'
-    constraintLayoutVersion = '1.1.3'
-    archVersion = '1.1.1'
-    roomVersion = '1.1.1'
+    versionName = '3.0.13'
+    versionCode = 3001300
+    minSdkVersion = 17
+    targetSdkVersion = 28
     compileSdkVersion = 28
+    androidxVersion = '1.0.0'
+    constraintLayoutVersion = '2.0.0-alpha2'
+    archVersion = '2.0.0'
+    roomVersion = '2.1.0-alpha01'
+    pagingVersion = '2.1.0-alpha01'
     junitVersion = '4.12'
     mockito = '2.8.9'
     powerMock = '1.7.4'
     retrofit = '2.4.0'
-    espressoVersion = '3.0.1'
-    supportTest = '1.0.2'
-    minSdkVersion = 17
-    targetSdkVersion = 28
-    versionName = '3.0.13'
-    versionCode = 3001300
+    espressoVersion = '3.1.0-beta02'
+    supportTest = '1.1.0-beta02'
 //    versionCode scheme is T M NN RR AA
 //    T: Target/Flavour (1 for Android, 2 for Chrome?)
 //    M: Major version from 0 to 9
diff --git a/java-libs/appcompat/AndroidManifest.xml b/java-libs/appcompat/AndroidManifest.xml
index dac4cb27e..7712ba970 100644
--- a/java-libs/appcompat/AndroidManifest.xml
+++ b/java-libs/appcompat/AndroidManifest.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="android.support.v7.appcompat">
+          package="androidx.appcompat.appcompat">
     <uses-sdk android:minSdkVersion="7"/>
     <application />
 </manifest>
diff --git a/java-libs/cardview/AndroidManifest.xml b/java-libs/cardview/AndroidManifest.xml
index 3ef02dc9d..5bb126f4a 100644
--- a/java-libs/cardview/AndroidManifest.xml
+++ b/java-libs/cardview/AndroidManifest.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="android.support.v7.cardview">
+          package="androidx.appcompat.cardview">
     <uses-sdk android:minSdkVersion="7"/>
     <application />
 </manifest>
diff --git a/libvlc/build.gradle b/libvlc/build.gradle
index c72436dcc..96c0bcf35 100644
--- a/libvlc/build.gradle
+++ b/libvlc/build.gradle
@@ -95,6 +95,6 @@ clean {
 }
 
 dependencies {
-    api "com.android.support:support-annotations:$rootProject.ext.appCompatVersion"
-    api "com.android.support:support-v4:$rootProject.ext.appCompatVersion"
+    api "androidx.annotation:annotation:$rootProject.ext.androidxVersion"
+    api "androidx.legacy:legacy-support-v4:$rootProject.ext.androidxVersion"
 }
diff --git a/libvlc/src/org/videolan/libvlc/AWindow.java b/libvlc/src/org/videolan/libvlc/AWindow.java
index 118109987..45b40e521 100644
--- a/libvlc/src/org/videolan/libvlc/AWindow.java
+++ b/libvlc/src/org/videolan/libvlc/AWindow.java
@@ -25,7 +25,7 @@ import android.graphics.SurfaceTexture;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.MainThread;
+import androidx.annotation.MainThread;
 import android.view.Surface;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
diff --git a/libvlc/src/org/videolan/libvlc/Dialog.java b/libvlc/src/org/videolan/libvlc/Dialog.java
index 58e718dbe..c028eeb0c 100644
--- a/libvlc/src/org/videolan/libvlc/Dialog.java
+++ b/libvlc/src/org/videolan/libvlc/Dialog.java
@@ -22,7 +22,7 @@ package org.videolan.libvlc;
 
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.MainThread;
+import androidx.annotation.MainThread;
 
 @SuppressWarnings("unused, JniMissingFunction")
 public abstract class Dialog {
diff --git a/libvlc/src/org/videolan/libvlc/IVLCVout.java b/libvlc/src/org/videolan/libvlc/IVLCVout.java
index c13094755..bfc2d718a 100644
--- a/libvlc/src/org/videolan/libvlc/IVLCVout.java
+++ b/libvlc/src/org/videolan/libvlc/IVLCVout.java
@@ -23,7 +23,7 @@ package org.videolan.libvlc;
 import android.annotation.TargetApi;
 import android.graphics.SurfaceTexture;
 import android.os.Build;
-import android.support.annotation.MainThread;
+import androidx.annotation.MainThread;
 import android.view.Surface;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
diff --git a/libvlc/src/org/videolan/libvlc/Media.java b/libvlc/src/org/videolan/libvlc/Media.java
index 0af51d6fb..22399cb78 100644
--- a/libvlc/src/org/videolan/libvlc/Media.java
+++ b/libvlc/src/org/videolan/libvlc/Media.java
@@ -22,7 +22,7 @@ package org.videolan.libvlc;
 
 import android.content.res.AssetFileDescriptor;
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.videolan.libvlc.util.AndroidUtil;
 import org.videolan.libvlc.util.HWDecoderUtil;
diff --git a/libvlc/src/org/videolan/libvlc/MediaDiscoverer.java b/libvlc/src/org/videolan/libvlc/MediaDiscoverer.java
index e9e4f9fd4..4ff852ae5 100644
--- a/libvlc/src/org/videolan/libvlc/MediaDiscoverer.java
+++ b/libvlc/src/org/videolan/libvlc/MediaDiscoverer.java
@@ -20,7 +20,7 @@
 
 package org.videolan.libvlc;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 @SuppressWarnings("unused, JniMissingFunction")
 public class MediaDiscoverer extends VLCObject<MediaDiscoverer.Event> {
diff --git a/libvlc/src/org/videolan/libvlc/MediaPlayer.java b/libvlc/src/org/videolan/libvlc/MediaPlayer.java
index 7bbfef827..6aeebd233 100644
--- a/libvlc/src/org/videolan/libvlc/MediaPlayer.java
+++ b/libvlc/src/org/videolan/libvlc/MediaPlayer.java
@@ -33,7 +33,7 @@ import android.media.AudioFormat;
 import android.media.AudioManager;
 import android.net.Uri;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.util.SparseArray;
 
 import org.videolan.libvlc.util.AndroidUtil;
diff --git a/libvlc/src/org/videolan/libvlc/RendererDiscoverer.java b/libvlc/src/org/videolan/libvlc/RendererDiscoverer.java
index 48d917ef6..fe107430c 100644
--- a/libvlc/src/org/videolan/libvlc/RendererDiscoverer.java
+++ b/libvlc/src/org/videolan/libvlc/RendererDiscoverer.java
@@ -20,7 +20,7 @@
 
 package org.videolan.libvlc;
 
-import android.support.v4.util.LongSparseArray;
+import androidx.collection.LongSparseArray;
 
 public class RendererDiscoverer extends VLCObject<RendererDiscoverer.Event> {
     private final static String TAG = "LibVLC/RendererDiscoverer";
diff --git a/libvlc/src/org/videolan/libvlc/util/Dumper.java b/libvlc/src/org/videolan/libvlc/util/Dumper.java
index c5722d74f..5f8dbe25f 100644
--- a/libvlc/src/org/videolan/libvlc/util/Dumper.java
+++ b/libvlc/src/org/videolan/libvlc/util/Dumper.java
@@ -21,7 +21,7 @@
 package org.videolan.libvlc.util;
 
 import android.net.Uri;
-import android.support.annotation.MainThread;
+import androidx.annotation.MainThread;
 
 import org.videolan.libvlc.LibVLC;
 import org.videolan.libvlc.Media;
diff --git a/libvlc/src/org/videolan/libvlc/util/MediaBrowser.java b/libvlc/src/org/videolan/libvlc/util/MediaBrowser.java
index 54154feb5..b3f6e0200 100644
--- a/libvlc/src/org/videolan/libvlc/util/MediaBrowser.java
+++ b/libvlc/src/org/videolan/libvlc/util/MediaBrowser.java
@@ -22,7 +22,7 @@ package org.videolan.libvlc.util;
 
 import android.net.Uri;
 import android.os.Handler;
-import android.support.annotation.MainThread;
+import androidx.annotation.MainThread;
 import android.util.Log;
 
 import org.videolan.libvlc.LibVLC;
diff --git a/libvlc/src/org/videolan/libvlc/util/VLCUtil.java b/libvlc/src/org/videolan/libvlc/util/VLCUtil.java
index b512c333f..85df32bc3 100644
--- a/libvlc/src/org/videolan/libvlc/util/VLCUtil.java
+++ b/libvlc/src/org/videolan/libvlc/util/VLCUtil.java
@@ -25,7 +25,7 @@ import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.net.Uri;
 import android.os.Build;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 import org.videolan.libvlc.LibVLC;
diff --git a/medialibrary/build.gradle b/medialibrary/build.gradle
index a237223e6..b21a83abd 100644
--- a/medialibrary/build.gradle
+++ b/medialibrary/build.gradle
@@ -69,9 +69,9 @@ clean {
 
 dependencies {
     implementation project(':libvlc')
-    api "com.android.support:support-v4:$rootProject.ext.appCompatVersion"
-    api "com.android.support:support-compat:$rootProject.ext.appCompatVersion"
-    api "com.android.support:support-fragment:$rootProject.ext.appCompatVersion"
+    api "androidx.legacy:legacy-support-v4:$rootProject.ext.androidxVersion"
+    api "androidx.core:core:$rootProject.ext.androidxVersion"
+    api "androidx.fragment:fragment:$rootProject.ext.androidxVersion"
     testImplementation "junit:junit:$rootProject.ext.junitVersion"
     implementation project(':tools')
 }
\ No newline at end of file
diff --git a/medialibrary/src/org/videolan/medialibrary/Medialibrary.java b/medialibrary/src/org/videolan/medialibrary/Medialibrary.java
index 703d9c9c8..d6b2d8ea3 100644
--- a/medialibrary/src/org/videolan/medialibrary/Medialibrary.java
+++ b/medialibrary/src/org/videolan/medialibrary/Medialibrary.java
@@ -1,19 +1,19 @@
 package org.videolan.medialibrary;
 
 import android.Manifest;
-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.MutableLiveData;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
+import androidx.core.content.ContextCompat;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.text.TextUtils;
 
 import org.videolan.libvlc.LibVLC;
diff --git a/medialibrary/src/org/videolan/medialibrary/Tools.java b/medialibrary/src/org/videolan/medialibrary/Tools.java
index 68348a0d1..15aa611a2 100644
--- a/medialibrary/src/org/videolan/medialibrary/Tools.java
+++ b/medialibrary/src/org/videolan/medialibrary/Tools.java
@@ -3,7 +3,7 @@ package org.videolan.medialibrary;
 
 import android.net.Uri;
 import android.os.Environment;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
 import org.videolan.medialibrary.media.MediaLibraryItem;
diff --git a/medialibrary/src/org/videolan/medialibrary/media/Artist.java b/medialibrary/src/org/videolan/medialibrary/media/Artist.java
index dc019a601..e06cd4914 100644
--- a/medialibrary/src/org/videolan/medialibrary/media/Artist.java
+++ b/medialibrary/src/org/videolan/medialibrary/media/Artist.java
@@ -2,7 +2,7 @@ package org.videolan.medialibrary.media;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.videolan.libvlc.util.VLCUtil;
 import org.videolan.medialibrary.Medialibrary;
diff --git a/medialibrary/src/org/videolan/medialibrary/media/Genre.java b/medialibrary/src/org/videolan/medialibrary/media/Genre.java
index 52a8f3ff0..6ad75eaa7 100644
--- a/medialibrary/src/org/videolan/medialibrary/media/Genre.java
+++ b/medialibrary/src/org/videolan/medialibrary/media/Genre.java
@@ -2,7 +2,7 @@ package org.videolan.medialibrary.media;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.videolan.medialibrary.Medialibrary;
 
diff --git a/medialibrary/src/org/videolan/medialibrary/media/MediaWrapper.java b/medialibrary/src/org/videolan/medialibrary/media/MediaWrapper.java
index ee6cb5007..e17196682 100644
--- a/medialibrary/src/org/videolan/medialibrary/media/MediaWrapper.java
+++ b/medialibrary/src/org/videolan/medialibrary/media/MediaWrapper.java
@@ -24,7 +24,7 @@ import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
 import org.videolan.libvlc.Media;
diff --git a/tools/build.gradle b/tools/build.gradle
index 240eee78e..9ebf32b64 100644
--- a/tools/build.gradle
+++ b/tools/build.gradle
@@ -13,7 +13,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
 
@@ -27,16 +27,16 @@ android {
 }
 
 dependencies {
-    api "com.android.support:appcompat-v7:$rootProject.ext.appCompatVersion"
-    api "com.android.support:support-tv-provider:$rootProject.ext.appCompatVersion"
+    api "androidx.appcompat:appcompat:$rootProject.ext.androidxVersion"
+    api "androidx.tvprovider:tvprovider:$rootProject.ext.androidxVersion"
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$rootProject.ext.kotlinx_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$rootProject.ext.kotlinx_version"
 
     testImplementation "junit:junit:$rootProject.ext.junitVersion"
-    androidTestImplementation "com.android.support.test:runner:$rootProject.ext.supportTest"
-    androidTestImplementation "com.android.support.test.espresso:espresso-core:$rootProject.espressoVersion"
+    androidTestImplementation "androidx.test:runner:$rootProject.ext.supportTest"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$rootProject.espressoVersion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 repositories {
diff --git a/tools/src/androidTest/java/videolan/org/commontools/ExampleInstrumentedTest.java b/tools/src/androidTest/java/videolan/org/commontools/ExampleInstrumentedTest.java
index fe7fe1570..0ff2b067a 100644
--- a/tools/src/androidTest/java/videolan/org/commontools/ExampleInstrumentedTest.java
+++ b/tools/src/androidTest/java/videolan/org/commontools/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package videolan.org.commontools;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tools/src/main/AndroidManifest.xml b/tools/src/main/AndroidManifest.xml
index 6f4732891..987191043 100644
--- a/tools/src/main/AndroidManifest.xml
+++ b/tools/src/main/AndroidManifest.xml
@@ -3,5 +3,5 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-sdk
-        tools:overrideLibrary="android.support.media.tv" />
+        tools:overrideLibrary="android.support.media.tv,androidx.tvprovider" />
 </manifest>
\ No newline at end of file
diff --git a/tools/src/main/java/org/videolan/tools/KotlinExtensions.kt b/tools/src/main/java/org/videolan/tools/KotlinExtensions.kt
index 4f7a0ef38..aa1cdf4d7 100644
--- a/tools/src/main/java/org/videolan/tools/KotlinExtensions.kt
+++ b/tools/src/main/java/org/videolan/tools/KotlinExtensions.kt
@@ -1,8 +1,8 @@
 package org.videolan.tools
 
-import android.arch.lifecycle.GenericLifecycleObserver
-import android.arch.lifecycle.Lifecycle
-import android.arch.lifecycle.LifecycleOwner
+import androidx.lifecycle.GenericLifecycleObserver
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
 import kotlinx.coroutines.experimental.CoroutineScope
 import kotlinx.coroutines.experimental.Dispatchers
 import kotlinx.coroutines.experimental.Job
diff --git a/tools/src/main/java/org/videolan/tools/MultiSelectHelper.kt b/tools/src/main/java/org/videolan/tools/MultiSelectHelper.kt
index fe3567631..1a200e9fc 100644
--- a/tools/src/main/java/org/videolan/tools/MultiSelectHelper.kt
+++ b/tools/src/main/java/org/videolan/tools/MultiSelectHelper.kt
@@ -1,6 +1,6 @@
 package org.videolan.tools
 
-import android.support.annotation.MainThread
+import androidx.annotation.MainThread
 import android.util.SparseBooleanArray
 
 
diff --git a/tools/src/main/java/videolan/org/commontools/LiveEvent.kt b/tools/src/main/java/videolan/org/commontools/LiveEvent.kt
index e4e15b838..e9daf4931 100644
--- a/tools/src/main/java/videolan/org/commontools/LiveEvent.kt
+++ b/tools/src/main/java/videolan/org/commontools/LiveEvent.kt
@@ -1,11 +1,11 @@
 package videolan.org.commontools
 
-import android.arch.lifecycle.LifecycleOwner
-import android.arch.lifecycle.MutableLiveData
-import android.arch.lifecycle.Observer
-import android.support.annotation.MainThread
-import android.support.annotation.Nullable
 import android.util.Log
+import androidx.annotation.MainThread
+import androidx.annotation.Nullable
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.Observer
 import java.util.concurrent.atomic.AtomicBoolean
 
 private const val TAG = "VLC/LiveEvent"
@@ -13,7 +13,7 @@ private const val TAG = "VLC/LiveEvent"
 class LiveEvent<T> : MutableLiveData<T>() {
     private val pending = AtomicBoolean(false)
     @MainThread
-    override fun observe(owner: LifecycleOwner, observer: Observer<T>) {
+    override fun observe(owner: LifecycleOwner, observer: Observer<in T>) {
         if (hasActiveObservers()) Log.w(TAG, "Multiple observers registered but only one will be notified of changes.")
         // Observe the internal MutableLiveData
         super.observe(owner, Observer<T> { t ->
@@ -21,7 +21,7 @@ class LiveEvent<T> : MutableLiveData<T>() {
         })
     }
 
-    override fun observeForever(observer: Observer<T>) {
+    override fun observeForever(observer: Observer<in T>) {
         super.observeForever { if (pending.compareAndSet(true, false)) observer.onChanged(it) }
     }
 
diff --git a/tools/src/main/java/videolan/org/commontools/TvChannelUtils.kt b/tools/src/main/java/videolan/org/commontools/TvChannelUtils.kt
index 860154755..a51b0e0b7 100644
--- a/tools/src/main/java/videolan/org/commontools/TvChannelUtils.kt
+++ b/tools/src/main/java/videolan/org/commontools/TvChannelUtils.kt
@@ -27,9 +27,9 @@ import android.content.SharedPreferences
 import android.database.Cursor
 import android.net.Uri
 import android.os.Build
-import android.support.annotation.RequiresApi
-import android.support.annotation.WorkerThread
-import android.support.media.tv.*
+import androidx.annotation.RequiresApi
+import androidx.annotation.WorkerThread
+import androidx.tvprovider.media.tv.*
 import android.util.Log
 
 typealias ProgramsList = MutableList<TvPreviewProgram>
diff --git a/vlc-android/AndroidManifest.xml b/vlc-android/AndroidManifest.xml
index 9b6b03ccf..e69dbee10 100644
--- a/vlc-android/AndroidManifest.xml
+++ b/vlc-android/AndroidManifest.xml
@@ -5,7 +5,7 @@
     android:installLocation="auto">
 
     <uses-sdk
-        tools:overrideLibrary="android.support.media.tv" />
+        tools:overrideLibrary="android.support.media.tv, androidx.tvprovider" />
 
     <uses-permission android:name="android.permission.READ_LOGS"
         android:maxSdkVersion="18" /> <!-- android:maxSdkVersion="15" -->
@@ -542,7 +542,7 @@
                 android:name="android.appwidget.provider"
                 android:resource="@xml/widget_provider_b" />
         </receiver>
-        <receiver android:name="android.support.v4.media.session.MediaButtonReceiver" >
+        <receiver android:name="androidx.media.session.MediaButtonReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.MEDIA_BUTTON" />
             </intent-filter>
diff --git a/vlc-android/androidTest/org/videolan/vlc/database/BrowserFavDaoTest.kt b/vlc-android/androidTest/org/videolan/vlc/database/BrowserFavDaoTest.kt
index 27d4792bc..87c4f87e4 100644
--- a/vlc-android/androidTest/org/videolan/vlc/database/BrowserFavDaoTest.kt
+++ b/vlc-android/androidTest/org/videolan/vlc/database/BrowserFavDaoTest.kt
@@ -20,7 +20,7 @@
 
 package org.videolan.vlc.database
 
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.runner.AndroidJUnit4
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.*
 import org.junit.Test
diff --git a/vlc-android/androidTest/org/videolan/vlc/database/ConvertersTest.kt b/vlc-android/androidTest/org/videolan/vlc/database/ConvertersTest.kt
index 20c4c96b2..202646686 100644
--- a/vlc-android/androidTest/org/videolan/vlc/database/ConvertersTest.kt
+++ b/vlc-android/androidTest/org/videolan/vlc/database/ConvertersTest.kt
@@ -21,7 +21,7 @@
 package org.videolan.vlc.database
 
 import android.net.Uri
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.runner.AndroidJUnit4
 import junit.framework.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/vlc-android/androidTest/org/videolan/vlc/database/CustomDirectoryDaoTest.kt b/vlc-android/androidTest/org/videolan/vlc/database/CustomDirectoryDaoTest.kt
index e8d7f3111..83792a58b 100644
--- a/vlc-android/androidTest/org/videolan/vlc/database/CustomDirectoryDaoTest.kt
+++ b/vlc-android/androidTest/org/videolan/vlc/database/CustomDirectoryDaoTest.kt
@@ -1,6 +1,6 @@
 package org.videolan.vlc.database
 
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.runner.AndroidJUnit4
 import org.hamcrest.CoreMatchers.hasItem
 import org.hamcrest.core.Is.`is`
 import org.junit.Assert.assertThat
diff --git a/vlc-android/androidTest/org/videolan/vlc/database/DbTest.kt b/vlc-android/androidTest/org/videolan/vlc/database/DbTest.kt
index 856624abf..04eef9bb7 100644
--- a/vlc-android/androidTest/org/videolan/vlc/database/DbTest.kt
+++ b/vlc-android/androidTest/org/videolan/vlc/database/DbTest.kt
@@ -20,9 +20,9 @@
 
 package org.videolan.vlc.database
 
-import android.arch.core.executor.testing.CountingTaskExecutorRule
-import android.arch.persistence.room.Room
-import android.support.test.InstrumentationRegistry
+import androidx.arch.core.executor.testing.CountingTaskExecutorRule
+import androidx.room.Room
+import androidx.test.InstrumentationRegistry
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
diff --git a/vlc-android/androidTest/org/videolan/vlc/database/ExternalSubDaoTest.kt b/vlc-android/androidTest/org/videolan/vlc/database/ExternalSubDaoTest.kt
index f5350d33f..8856c7da5 100644
--- a/vlc-android/androidTest/org/videolan/vlc/database/ExternalSubDaoTest.kt
+++ b/vlc-android/androidTest/org/videolan/vlc/database/ExternalSubDaoTest.kt
@@ -20,7 +20,7 @@
 
 package org.videolan.vlc.database
 
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.runner.AndroidJUnit4
 import org.hamcrest.Matchers.*
 import org.junit.Assert.assertThat
 import org.junit.Test
diff --git a/vlc-android/androidTest/org/videolan/vlc/database/MigrationTest.kt b/vlc-android/androidTest/org/videolan/vlc/database/MigrationTest.kt
index 4f69565fe..f9a6bda5a 100644
--- a/vlc-android/androidTest/org/videolan/vlc/database/MigrationTest.kt
+++ b/vlc-android/androidTest/org/videolan/vlc/database/MigrationTest.kt
@@ -20,13 +20,13 @@
 
 package org.videolan.vlc.database
 
-import android.arch.persistence.db.framework.FrameworkSQLiteOpenHelperFactory
-import android.arch.persistence.room.Room
-import android.arch.persistence.room.migration.Migration
-import android.arch.persistence.room.testing.MigrationTestHelper
+import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
+import androidx.room.Room
+import androidx.room.migration.Migration
+import androidx.room.testing.MigrationTestHelper
 import android.net.Uri
-import android.support.test.InstrumentationRegistry
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.InstrumentationRegistry
+import androidx.test.runner.AndroidJUnit4
 import org.hamcrest.CoreMatchers.`is`
 import org.hamcrest.CoreMatchers.hasItem
 import org.junit.Assert.*
diff --git a/vlc-android/androidTest/org/videolan/vlc/database/SlaveDaoTest.kt b/vlc-android/androidTest/org/videolan/vlc/database/SlaveDaoTest.kt
index 0c6591d15..a5a103083 100644
--- a/vlc-android/androidTest/org/videolan/vlc/database/SlaveDaoTest.kt
+++ b/vlc-android/androidTest/org/videolan/vlc/database/SlaveDaoTest.kt
@@ -20,7 +20,7 @@
 
 package org.videolan.vlc.database
 
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.runner.AndroidJUnit4
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.*
 import org.junit.Test
diff --git a/vlc-android/build.gradle b/vlc-android/build.gradle
index 580c325af..6754bc1e1 100644
--- a/vlc-android/build.gradle
+++ b/vlc-android/build.gradle
@@ -46,7 +46,7 @@ android {
         resValue "string", "build_revision", revision()
         resValue "string", "build_vlc_revision", vlcRevision()
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         // The following argument makes the Android Test Orchestrator run its
         // "pm clear" command after each test invocation. This command ensures
         // that the app's state is completely cleared between tests.
@@ -73,7 +73,7 @@ android {
     }
 
     testOptions {
-        execution 'ANDROID_TEST_ORCHESTRATOR'
+        execution 'ANDROIDX_TEST_ORCHESTRATOR'
         unitTests {
             includeAndroidResources = true
         }
@@ -196,42 +196,41 @@ task generateSources (type: Jar) {
 }
 
 dependencies {
-    def paging_version = "1.0.1"
     implementation project(':libvlc')
     implementation project(':medialibrary')
     implementation project(':api')
     // AppCompat
-    implementation "com.android.support:recyclerview-v7:$rootProject.ext.appCompatVersion"
-    implementation "com.android.support:design:$rootProject.ext.appCompatVersion"
-    implementation "com.android.support:support-annotations:$rootProject.ext.appCompatVersion"
-    implementation "com.android.support:preference-v7:$rootProject.ext.appCompatVersion"
-    implementation "com.android.support.constraint:constraint-layout:$rootProject.ext.constraintLayoutVersion"
+    implementation "androidx.recyclerview:recyclerview:$rootProject.ext.androidxVersion"
+    implementation "com.google.android.material:material:$rootProject.ext.androidxVersion"
+    implementation "androidx.annotation:annotation:$rootProject.ext.androidxVersion"
+    implementation "androidx.preference:preference:$rootProject.ext.androidxVersion"
+    implementation "androidx.constraintlayout:constraintlayout:$rootProject.ext.constraintLayoutVersion"
     //TV
-    implementation "com.android.support:leanback-v17:$rootProject.ext.appCompatVersion"
-    implementation "com.android.support:preference-leanback-v17:$rootProject.ext.appCompatVersion"
-    implementation "com.android.support:support-tv-provider:$rootProject.ext.appCompatVersion"
+    implementation "androidx.leanback:leanback:$rootProject.ext.androidxVersion"
+    implementation "androidx.leanback:leanback-preference:$rootProject.ext.androidxVersion"
+    implementation "androidx.tvprovider:tvprovider:$rootProject.ext.androidxVersion"
     // Kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$rootProject.ext.kotlinx_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$rootProject.ext.kotlinx_version"
-    implementation "android.arch.lifecycle:extensions:$rootProject.ext.archVersion"
-    kapt "android.arch.lifecycle:compiler:$rootProject.ext.archVersion"
-    implementation "android.arch.persistence.room:runtime:$rootProject.ext.roomVersion"
-    kapt "android.arch.persistence.room:compiler:$rootProject.ext.roomVersion"
-    implementation "android.arch.paging:runtime:$paging_version"
+    implementation "androidx.lifecycle:lifecycle-extensions:$rootProject.ext.archVersion"
+    kapt "androidx.lifecycle:lifecycle-compiler:$rootProject.ext.archVersion"
+    implementation "androidx.room:room-runtime:$rootProject.ext.roomVersion"
+    kapt "androidx.room:room-compiler:$rootProject.ext.roomVersion"
+    implementation "androidx.paging:paging-runtime:$rootProject.ext.pagingVersion"
     // Retrofit
     implementation "com.squareup.retrofit2:retrofit:$rootProject.ext.retrofit"
     implementation "com.squareup.retrofit2:converter-moshi:$rootProject.ext.retrofit"
-    implementation project(':tools')
+    implementation project(":tools")
     // Test
-    androidTestImplementation "com.android.support.test.espresso:espresso-contrib:$rootProject.espressoVersion"
-    androidTestImplementation "com.android.support.test.espresso:espresso-core:$rootProject.espressoVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-contrib:$rootProject.espressoVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$rootProject.espressoVersion"
     testImplementation "junit:junit:$rootProject.ext.junitVersion"
-    androidTestImplementation "android.arch.persistence.room:testing:$rootProject.ext.roomVersion"
-    testImplementation "android.arch.core:core-testing:$rootProject.ext.archVersion"
-    androidTestImplementation "android.arch.core:core-testing:$rootProject.ext.archVersion"
-    androidTestImplementation "com.android.support.test:runner:$rootProject.ext.supportTest"
-    androidTestUtil "com.android.support.test:orchestrator:$rootProject.ext.supportTest"
+    androidTestImplementation "androidx.room:room-testing:$rootProject.ext.roomVersion"
+    testImplementation "androidx.arch.core:core-testing:$rootProject.ext.archVersion"
+    androidTestImplementation "androidx.arch.core:core-testing:$rootProject.ext.archVersion"
+    androidTestImplementation "androidx.test:runner:$rootProject.ext.supportTest"
+    androidTestUtil "androidx.test:orchestrator:$rootProject.ext.supportTest"
     testImplementation "org.mockito:mockito-core:$rootProject.ext.mockito"
     testImplementation "org.powermock:powermock-api-mockito2:$rootProject.ext.powerMock"
     testImplementation "org.powermock:powermock-module-junit4:$rootProject.ext.powerMock"
diff --git a/vlc-android/res/layout-land/audio_player.xml b/vlc-android/res/layout-land/audio_player.xml
index 3a57bb023..0b4c70f4d 100644
--- a/vlc-android/res/layout-land/audio_player.xml
+++ b/vlc-android/res/layout-land/audio_player.xml
@@ -11,7 +11,7 @@
             name="showCover"
             type="boolean" />
     </data>
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/content_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -47,7 +47,7 @@
             android:paddingRight="0px"
             android:progressDrawable="?attr/progress_mini_player" />
 
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/header"
             android:layout_width="0dp"
             android:layout_height="60dp"
@@ -82,7 +82,7 @@
                 app:layout_constraintEnd_toStartOf="@+id/barrier"
                 android:background="#00000000" />
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:id="@+id/playlist_search_text"
@@ -95,7 +95,7 @@
                     android:hint="@string/search_hint"
                     android:inputType="textFilter"
                     android:imeOptions="actionSearch"/>
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
             <ImageView
                 android:id="@+id/playlist_ab_repeat"
@@ -181,7 +181,7 @@
                 android:onLongClick="@{fragment::onStopClick}"
                 android:src="?attr/ic_pause" />
 
-            <android.support.constraint.Barrier
+            <androidx.constraintlayout.widget.Barrier
                 android:id="@+id/barrier"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
@@ -190,9 +190,9 @@
                 app:barrierDirection="start"
                 app:constraint_referenced_ids="header_time, playlist_ab_repeat"/>
 
-        </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/songs_list"
             android:layout_width="0dp"
             android:layout_height="0dp"
@@ -347,5 +347,5 @@
             android:scaleType="fitXY"
             android:onClick="@{fragment::onPreviousClick}"
             android:src="?attr/ic_previous" />
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/vlc-android/res/layout-land/equalizer.xml b/vlc-android/res/layout-land/equalizer.xml
index db3c19ae5..da8496d09 100644
--- a/vlc-android/res/layout-land/equalizer.xml
+++ b/vlc-android/res/layout-land/equalizer.xml
@@ -7,14 +7,14 @@
             type="org.videolan.vlc.gui.audio.EqualizerFragment.EqualizerState" />
     </data>
 
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:minHeight="320dp"
         android:minWidth="448dp"
         android:padding="@dimen/default_margin">
 
-        <android.support.v7.widget.SwitchCompat
+        <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/equalizer_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -24,7 +24,7 @@
             app:layout_constraintRight_toLeftOf="@+id/equalizer_presets"
             app:layout_constraintHorizontal_chainStyle="spread_inside" />
 
-        <android.support.v7.widget.AppCompatSpinner
+        <androidx.appcompat.widget.AppCompatSpinner
             android:id="@+id/equalizer_presets"
             android:layout_width="0dp"
             android:layout_height="0dp"
@@ -69,7 +69,7 @@
             app:layout_constraintLeft_toLeftOf="@+id/equalizer_save"
             app:layout_constraintRight_toRightOf="@+id/equalizer_save" />
 
-        <android.support.constraint.Guideline
+        <androidx.constraintlayout.widget.Guideline
             android:id="@+id/guideine"
             android:orientation="vertical"
             android:layout_width="0dp"
@@ -113,5 +113,5 @@
                 app:layout_constraintBottom_toBottomOf="parent"/>
         </HorizontalScrollView>
 
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/vlc-android/res/layout/about.xml b/vlc-android/res/layout/about.xml
index 5f8ee48a6..8fd484b7f 100644
--- a/vlc-android/res/layout/about.xml
+++ b/vlc-android/res/layout/about.xml
@@ -6,7 +6,7 @@
     android:paddingBottom="@dimen/actionBarSize">
 
     <include layout="@layout/tab_layout" />
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/pager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -15,5 +15,5 @@
 
         <include layout="@layout/about_main" />
         <include layout="@layout/about_licence" />
-    </android.support.v4.view.ViewPager>
+    </androidx.viewpager.widget.ViewPager>
 </RelativeLayout>
diff --git a/vlc-android/res/layout/audio_albums_songs.xml b/vlc-android/res/layout/audio_albums_songs.xml
index f29f7e995..005064c33 100644
--- a/vlc-android/res/layout/audio_albums_songs.xml
+++ b/vlc-android/res/layout/audio_albums_songs.xml
@@ -23,14 +23,14 @@
         android:layout_height="match_parent"
         android:layout_below="@+id/searchButton"
         android:layout_centerHorizontal="true" >
-        <android.support.v4.view.ViewPager
+        <androidx.viewpager.widget.ViewPager
             android:id="@+id/pager"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
             <include layout="@layout/audio_recyclerview" />
             <include layout="@layout/audio_recyclerview" />
-        </android.support.v4.view.ViewPager>
+        </androidx.viewpager.widget.ViewPager>
     </org.videolan.vlc.gui.view.SwipeRefreshLayout>
     <org.videolan.vlc.gui.view.FastScroller
         android:id="@+id/songs_fast_scroller"
diff --git a/vlc-android/res/layout/audio_browser.xml b/vlc-android/res/layout/audio_browser.xml
index 7b60dcec1..549f6e187 100644
--- a/vlc-android/res/layout/audio_browser.xml
+++ b/vlc-android/res/layout/audio_browser.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -28,7 +28,7 @@
         app:layout_constraintTop_toBottomOf="@+id/searchButton"
         app:layout_constraintBottom_toBottomOf="parent" >
 
-        <android.support.v4.view.ViewPager
+        <androidx.viewpager.widget.ViewPager
             android:id="@+id/pager"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -39,7 +39,7 @@
             <include layout="@layout/audio_recyclerview" />
             <include layout="@layout/audio_recyclerview" />
             <include layout="@layout/audio_recyclerview" />
-        </android.support.v4.view.ViewPager>
+        </androidx.viewpager.widget.ViewPager>
     </org.videolan.vlc.gui.view.SwipeRefreshLayout>
 
     <TextView
@@ -70,4 +70,4 @@
         app:layout_constraintBottom_toBottomOf="@+id/swipeLayout"
         app:layout_constraintTop_toTopOf="@+id/swipeLayout"
         android:visibility="invisible"/>
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vlc-android/res/layout/audio_browser_item.xml b/vlc-android/res/layout/audio_browser_item.xml
index 8f0d95347..0ceb12499 100644
--- a/vlc-android/res/layout/audio_browser_item.xml
+++ b/vlc-android/res/layout/audio_browser_item.xml
@@ -25,7 +25,7 @@
             type="org.videolan.vlc.gui.audio.AudioBrowserAdapter.MediaItemViewHolder" />
     </data>
 
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="@dimen/audio_browser_item_size"
@@ -105,5 +105,5 @@
             android:src="@drawable/ic_more"
             android:contentDescription="@string/more_actions"
             android:onClick="@{holder::onMoreClick}" />
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/vlc-android/res/layout/audio_media_switcher_item.xml b/vlc-android/res/layout/audio_media_switcher_item.xml
index 583c9b57c..d050fa66c 100644
--- a/vlc-android/res/layout/audio_media_switcher_item.xml
+++ b/vlc-android/res/layout/audio_media_switcher_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
@@ -54,4 +54,4 @@
             app:layout_constraintStart_toEndOf="@id/cover"
             app:layout_constraintEnd_toEndOf="parent" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vlc-android/res/layout/audio_player.xml b/vlc-android/res/layout/audio_player.xml
index e942fae65..8b309c1a0 100644
--- a/vlc-android/res/layout/audio_player.xml
+++ b/vlc-android/res/layout/audio_player.xml
@@ -11,7 +11,7 @@
             name="showCover"
             type="boolean" />
     </data>
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/content_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -47,7 +47,7 @@
             android:paddingRight="0px"
             android:progressDrawable="?attr/progress_mini_player" />
 
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/header"
             android:layout_width="0dp"
             android:layout_height="60dp"
@@ -81,7 +81,7 @@
                 app:layout_constraintEnd_toStartOf="@+id/barrier"
                 android:background="#00000000" />
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:id="@+id/playlist_search_text"
@@ -94,7 +94,7 @@
                     android:hint="@string/search_hint"
                     android:inputType="textFilter"
                     android:imeOptions="actionSearch"/>
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
             <ImageView
                 android:id="@+id/playlist_ab_repeat"
@@ -180,7 +180,7 @@
                 android:onLongClick="@{fragment::onStopClick}"
                 android:src="?attr/ic_pause" />
 
-            <android.support.constraint.Barrier
+            <androidx.constraintlayout.widget.Barrier
                 android:id="@+id/barrier"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
@@ -189,9 +189,9 @@
                 app:barrierDirection="start"
                 app:constraint_referenced_ids="header_time, playlist_ab_repeat"/>
 
-        </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/songs_list"
             android:layout_width="0dp"
             android:layout_height="0dp"
@@ -345,5 +345,5 @@
             android:scaleType="fitXY"
             android:onClick="@{fragment::onPreviousClick}"
             android:src="?attr/ic_previous" />
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/vlc-android/res/layout/audio_player_header.xml b/vlc-android/res/layout/audio_player_header.xml
index d1d3b582f..5f5292f1c 100644
--- a/vlc-android/res/layout/audio_player_header.xml
+++ b/vlc-android/res/layout/audio_player_header.xml
@@ -8,7 +8,7 @@
             name="fragment"
             type="org.videolan.vlc.gui.audio.AudioPlayer" />
     </data>
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/header"
         android:layout_width="0dp"
         android:layout_height="60dp"
@@ -39,7 +39,7 @@
             app:layout_constraintEnd_toStartOf="@+id/playlist_ab_repeat"
             android:background="#00000000" />
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:id="@+id/playlist_search_text"
@@ -52,7 +52,7 @@
                 android:hint="@string/search_hint"
                 android:inputType="textFilter"
                 android:imeOptions="actionSearch"/>
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
         <ImageView
             android:id="@+id/playlist_ab_repeat"
@@ -138,5 +138,5 @@
             android:onLongClick="@{fragment::onStopClick}"
             android:src="?attr/ic_pause" />
 
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/vlc-android/res/layout/audio_recyclerview.xml b/vlc-android/res/layout/audio_recyclerview.xml
index 6708709d6..2ba514c48 100644
--- a/vlc-android/res/layout/audio_recyclerview.xml
+++ b/vlc-android/res/layout/audio_recyclerview.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.RecyclerView
+<androidx.recyclerview.widget.RecyclerView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/vlc-android/res/layout/audioplayercontainer.xml b/vlc-android/res/layout/audioplayercontainer.xml
index c0cd248a3..8600faf2b 100644
--- a/vlc-android/res/layout/audioplayercontainer.xml
+++ b/vlc-android/res/layout/audioplayercontainer.xml
@@ -9,7 +9,7 @@
     android:visibility="gone"
     app:layout_behavior="org.videolan.vlc.gui.helpers.BottomSheetBehavior"
     tools:targetApi="lollipop">
-    <android.support.v7.widget.ViewStubCompat
+    <androidx.appcompat.widget.ViewStubCompat
         android:id="@+id/audio_player_stub"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/vlc-android/res/layout/browser_item.xml b/vlc-android/res/layout/browser_item.xml
index 5cdd57f6e..0b8db6b27 100644
--- a/vlc-android/res/layout/browser_item.xml
+++ b/vlc-android/res/layout/browser_item.xml
@@ -32,7 +32,7 @@
             name="bgColor"
             type="int" />
     </data>
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="48dp"
@@ -130,5 +130,5 @@
             android:visibility="@{hasContextMenu ? View.VISIBLE : View.GONE, default=gone}"
             android:onClick="@{holder::onMoreClick}"
             android:clickable="@{hasContextMenu}" />
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/vlc-android/res/layout/contextual_sheet.xml b/vlc-android/res/layout/contextual_sheet.xml
index 165d02675..f36ef60ab 100644
--- a/vlc-android/res/layout/contextual_sheet.xml
+++ b/vlc-android/res/layout/contextual_sheet.xml
@@ -12,9 +12,9 @@
         style="@style/VLC.TextViewTitle"
         android:textColor="@color/orange800"
         android:layout_margin="@dimen/default_margin"/>
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/ctx_list"
         android:layout_height="wrap_content"
         android:layout_width="match_parent">
-    </android.support.v7.widget.RecyclerView>
+    </androidx.recyclerview.widget.RecyclerView>
 </LinearLayout>
\ No newline at end of file
diff --git a/vlc-android/res/layout/dialog_playlist.xml b/vlc-android/res/layout/dialog_playlist.xml
index a634833a7..c4cff2383 100644
--- a/vlc-android/res/layout/dialog_playlist.xml
+++ b/vlc-android/res/layout/dialog_playlist.xml
@@ -6,7 +6,7 @@
     android:padding="@dimen/default_margin">
 
     <!--TODO : textColorHint doesn't work -->
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/dialog_playlist_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -19,7 +19,7 @@
             android:textColorHint="?attr/font_default"
             android:inputType="text"
             android:imeOptions="actionSend"/>
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
     <Button
         android:id="@+id/dialog_playlist_cancel"
         android:layout_width="wrap_content"
@@ -46,7 +46,7 @@
         android:layout_marginTop="@dimen/half_default_margin"
         android:layout_marginStart="@dimen/half_default_margin"
         android:layout_below="@+id/dialog_playlist_cancel">
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@android:id/list"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
diff --git a/vlc-android/res/layout/dialog_renderers.xml b/vlc-android/res/layout/dialog_renderers.xml
index ce75ef488..30fbdae3b 100644
--- a/vlc-android/res/layout/dialog_renderers.xml
+++ b/vlc-android/res/layout/dialog_renderers.xml
@@ -8,7 +8,7 @@
             name="holder"
             type="org.videolan.vlc.gui.dialogs.RenderersDialog.RendererClickhandler" />
     </data>
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:minWidth="384dp">
@@ -20,7 +20,7 @@
             android:text="@string/renderer_list_title"
             android:textAppearance="@style/TextAppearance.AppCompat.Title"
             android:padding="16dp" />
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/renderers_list"
             android:layout_width="0dp"
             android:layout_height="0dp"
@@ -43,5 +43,5 @@
             android:textColor="@color/orange800"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:onClick="@{() -> holder.connect((RendererItem)null)}" />
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/vlc-android/res/layout/directory_browser.xml b/vlc-android/res/layout/directory_browser.xml
index 87a90a58f..b4da176c9 100644
--- a/vlc-android/res/layout/directory_browser.xml
+++ b/vlc-android/res/layout/directory_browser.xml
@@ -7,7 +7,7 @@
             name="showFavorites"
             type="boolean" />
     </data>
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent" >
             <include layout="@layout/button_search"
@@ -26,7 +26,7 @@
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintHeight_default="spread" >
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/network_list"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -44,5 +44,5 @@
                 android:gravity="center"
                 android:text="@string/loading" />
 
-        </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/vlc-android/res/layout/equalizer.xml b/vlc-android/res/layout/equalizer.xml
index 6de5e3837..324ee5b5d 100644
--- a/vlc-android/res/layout/equalizer.xml
+++ b/vlc-android/res/layout/equalizer.xml
@@ -6,7 +6,7 @@
             type="org.videolan.vlc.gui.audio.EqualizerFragment.EqualizerState" />
     </data>
 
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
@@ -14,7 +14,7 @@
         android:minHeight="320dp"
         android:padding="@dimen/default_margin" >
 
-        <android.support.v7.widget.SwitchCompat
+        <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/equalizer_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -24,7 +24,7 @@
             app:layout_constraintHorizontal_chainStyle="spread_inside"
             app:layout_constraintVertical_chainStyle="packed"/>
 
-        <android.support.v7.widget.AppCompatSpinner
+        <androidx.appcompat.widget.AppCompatSpinner
             android:id="@+id/equalizer_presets"
             android:layout_width="0dp"
             android:layout_height="0dp"
@@ -109,5 +109,5 @@
                 app:layout_constraintBottom_toBottomOf="parent"/>
         </HorizontalScrollView>
 
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/vlc-android/res/layout/extension_item_view.xml b/vlc-android/res/layout/extension_item_view.xml
index 49027221d..0afacec1e 100644
--- a/vlc-android/res/layout/extension_item_view.xml
+++ b/vlc-android/res/layout/extension_item_view.xml
@@ -16,7 +16,7 @@
             type="android.graphics.drawable.BitmapDrawable"/>
     </data>
 
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="60dp"
         android:layout_margin="5dp"
@@ -93,5 +93,5 @@
             android:layout_marginRight="1dp"
             tools:src="@drawable/ic_more"
             android:onClick="@{holder::onMoreClick}" />
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/vlc-android/res/layout/file_picker_fragment.xml b/vlc-android/res/layout/file_picker_fragment.xml
index c2cffde98..7a574038c 100644
--- a/vlc-android/res/layout/file_picker_fragment.xml
+++ b/vlc-android/res/layout/file_picker_fragment.xml
@@ -8,7 +8,7 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/network_list"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/vlc-android/res/layout/history_item.xml b/vlc-android/res/layout/history_item.xml
index 4cca0f325..cbbf49506 100644
--- a/vlc-android/res/layout/history_item.xml
+++ b/vlc-android/res/layout/history_item.xml
@@ -15,7 +15,7 @@
             name="bgColor"
             type="int" />
     </data>
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@{bgColor}"
@@ -58,5 +58,5 @@
             app:layout_constraintStart_toEndOf="@id/icon"
             app:layout_constraintEnd_toEndOf="parent"/>
 
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/vlc-android/res/layout/history_list.xml b/vlc-android/res/layout/history_list.xml
index 99b58d1a7..6036f7966 100644
--- a/vlc-android/res/layout/history_list.xml
+++ b/vlc-android/res/layout/history_list.xml
@@ -10,7 +10,7 @@
         android:layout_height="match_parent"
         android:layout_gravity="center_horizontal"
         android:background="?attr/background_default">
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent">
             <include layout="@layout/button_search"
@@ -19,7 +19,7 @@
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@android:id/list"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
@@ -45,6 +45,6 @@
                 android:text="@string/nohistory"
                 android:textSize="20sp"
                 android:visibility="gone"/>
-        </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </org.videolan.vlc.gui.view.SwipeRefreshLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/vlc-android/res/layout/info_activity.xml b/vlc-android/res/layout/info_activity.xml
index 58500388e..63a2a28c7 100644
--- a/vlc-android/res/layout/info_activity.xml
+++ b/vlc-android/res/layout/info_activity.xml
@@ -32,18 +32,18 @@
             name="progress"
             type="int" />
     </data>
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:vlc="http://schemas.android.com/apk/res-auto"
         android:id="@+id/coordinator"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-        <android.support.design.widget.AppBarLayout
+        <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appbar"
             android:layout_width="match_parent"
             android:layout_height="@dimen/info_appbar_height"
             android:fitsSystemWindows="true">
-            <android.support.design.widget.CollapsingToolbarLayout
+            <com.google.android.material.appbar.CollapsingToolbarLayout
                 android:id="@+id/collapsing_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -61,7 +61,7 @@
                     android:scaleType="centerCrop"
                     android:src="@{cover}"
                     vlc:layout_collapseMode="parallax" />
-                <android.support.v7.widget.Toolbar
+                <androidx.appcompat.widget.Toolbar
                     android:id="@+id/main_toolbar"
                     android:layout_width="match_parent"
                     android:layout_height="?attr/actionBarSize"
@@ -72,10 +72,10 @@
                     vlc:titleMarginStart="@dimen/default_margin"
                     vlc:layout_scrollFlags="scroll|enterAlways"
                     vlc:layout_collapseMode="pin"/>
-            </android.support.design.widget.CollapsingToolbarLayout>
-        </android.support.design.widget.AppBarLayout>
+            </com.google.android.material.appbar.CollapsingToolbarLayout>
+        </com.google.android.material.appbar.AppBarLayout>
 
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -149,7 +149,7 @@
                 android:textColor="?attr/font_light"
                 android:text="@{sizeValueText}"
                 android:visibility="@{sizeValue != null ? View.VISIBLE : View.INVISIBLE}" />
-            <android.support.constraint.Barrier
+            <androidx.constraintlayout.widget.Barrier
                 android:id="@+id/barrier"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
@@ -187,7 +187,7 @@
                 vlc:layout_constraintEnd_toEndOf="parent"
                 android:src="@drawable/ic_audiosub_circle_normal_o"
                 android:visibility="gone" />
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/list"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
@@ -199,9 +199,9 @@
                 android:paddingBottom="@dimen/listview_bottom_padding"
                 android:visibility="@{item.itemType == MediaLibraryItem.TYPE_MEDIA ? View.VISIBLE : View.INVISIBLE}" />
 
-        </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <android.support.design.widget.FloatingActionButton
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
             vlc:rippleColor="@color/orange50"
             android:id="@+id/fab"
             android:layout_width="wrap_content"
@@ -215,5 +215,5 @@
 
         <include layout="@layout/audioplayercontainer"/>
 
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </layout>
\ No newline at end of file
diff --git a/vlc-android/res/layout/main.xml b/vlc-android/res/layout/main.xml
index f2c417b6e..e79fa7cf3 100644
--- a/vlc-android/res/layout/main.xml
+++ b/vlc-android/res/layout/main.xml
@@ -12,7 +12,7 @@
     android:nextFocusDown="@+id/ml_menu_search"
     android:nextFocusForward="@+id/ml_menu_search"
     android:fitsSystemWindows="true" >
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/coordinator"
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
@@ -27,7 +27,7 @@
             android:keyboardNavigationCluster="true"
             tools:targetApi="o" />
 
-        <android.support.v7.widget.ViewStubCompat
+        <androidx.appcompat.widget.ViewStubCompat
             android:id="@+id/scan_viewstub"
             android:layout_width="match_parent"
             android:layout_height="@dimen/progress_layout_height"
@@ -36,7 +36,7 @@
 
         <include layout="@layout/audioplayercontainer"/>
 
-        <android.support.design.widget.FloatingActionButton
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/fab"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -49,10 +49,10 @@
             app:layout_behavior="org.videolan.vlc.gui.helpers.FloatingActionButtonBehavior"
             android:visibility="invisible"
             android:layout_margin="16dp"/>
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     <!-- The navigation drawer -->
-    <android.support.design.widget.NavigationView
+    <com.google.android.material.navigation.NavigationView
         android:id="@+id/navigation"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
@@ -63,13 +63,13 @@
         android:keyboardNavigationCluster="true"
         tools:targetApi="o" />
 
-    <android.support.v7.widget.ViewStubCompat
+    <androidx.appcompat.widget.ViewStubCompat
         android:id="@+id/audio_playlist_tips"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout="@layout/audio_playlist_tips"/>
 
-    <android.support.v7.widget.ViewStubCompat
+    <androidx.appcompat.widget.ViewStubCompat
         android:id="@+id/audio_player_tips"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/vlc-android/res/layout/ml_wizard_activity.xml b/vlc-android/res/layout/ml_wizard_activity.xml
index 9fc69c135..f7bea87c0 100644
--- a/vlc-android/res/layout/ml_wizard_activity.xml
+++ b/vlc-android/res/layout/ml_wizard_activity.xml
@@ -2,7 +2,7 @@
 <layout xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android">
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     android:layout_width="320dp"
     android:layout_height="wrap_content"
     android:padding="16dp">
@@ -41,5 +41,5 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/vlc-android/res/layout/mrl_item.xml b/vlc-android/res/layout/mrl_item.xml
index 5981387b0..4c7f92033 100644
--- a/vlc-android/res/layout/mrl_item.xml
+++ b/vlc-android/res/layout/mrl_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
@@ -46,5 +46,5 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             android:src="@drawable/ic_more"/>
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/vlc-android/res/layout/mrl_panel.xml b/vlc-android/res/layout/mrl_panel.xml
index 2eedf166b..38279cc99 100644
--- a/vlc-android/res/layout/mrl_panel.xml
+++ b/vlc-android/res/layout/mrl_panel.xml
@@ -6,11 +6,11 @@
             type="org.videolan.vlc.viewmodels.StreamsModel"/>
     </data>
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/mrl_root"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -19,7 +19,7 @@
             android:padding="16dp"
             android:minWidth="@dimen/mrl_panel_min_width">
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/mrl_edit"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -33,7 +33,7 @@
 
                 <!--android:paddingTop ==> Space between cursor and top hint-->
                 <!--android:paddingBottom ==> Space between cursor and bottom border-->
-                <android.support.design.widget.TextInputEditText
+                <com.google.android.material.textfield.TextInputEditText
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_alignParentTop="true"
@@ -48,7 +48,7 @@
                     android:text="@={viewmodel.observableSearchText}"
                     android:textColor="?font_default"
                     android:textCursorDrawable="@drawable/cursor_o" />
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
             <ImageView
                 android:id="@+id/play"
@@ -62,7 +62,7 @@
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="@+id/mrl_edit" />
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/mrl_list"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -71,6 +71,6 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/mrl_edit" />
-        </android.support.constraint.ConstraintLayout>
-    </android.support.v4.widget.NestedScrollView>
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.core.widget.NestedScrollView>
 </layout>
diff --git a/vlc-android/res/layout/network_server_dialog.xml b/vlc-android/res/layout/network_server_dialog.xml
index 24477ef07..9ee4b32a3 100644
--- a/vlc-android/res/layout/network_server_dialog.xml
+++ b/vlc-android/res/layout/network_server_dialog.xml
@@ -4,7 +4,7 @@
     android:layout_width="wrap_content" android:layout_height="wrap_content"
     android:padding="20dp">
 
-    <android.support.v7.widget.AppCompatSpinner
+    <androidx.appcompat.widget.AppCompatSpinner
         android:id="@+id/server_protocol"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -36,7 +36,7 @@
         android:inputType="number"
         android:singleLine="true" />
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/server_domain"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -52,9 +52,9 @@
             android:singleLine="true">
             <requestFocus/>
         </EditText>
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/server_username"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -67,10 +67,10 @@
             android:hint="@string/server_username_hint"
             android:inputType="text"
             android:singleLine="true" />
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/server_folder"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -83,7 +83,7 @@
             android:hint="@string/server_folder_hint"
             android:inputType="textUri"
             android:singleLine="true" />
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
     <TextView
         android:id="@+id/server_url"
@@ -93,7 +93,7 @@
         android:layout_margin="5dp"
        android:gravity="center_horizontal"/>
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/server_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -106,7 +106,7 @@
             android:hint="@string/server_servername_hint"
             android:inputType="text"
             android:singleLine="true" />
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
     <Button
         android:id="@+id/server_cancel"
diff --git a/vlc-android/res/layout/player.xml b/vlc-android/res/layout/player.xml
index d73225574..54e7ca3da 100644
--- a/vlc-android/res/layout/player.xml
+++ b/vlc-android/res/layout/player.xml
@@ -42,7 +42,7 @@
         android:layout_height="match_parent"
         android:fitsSystemWindows="true" >
 
-        <android.support.v7.widget.ViewStubCompat
+        <androidx.appcompat.widget.ViewStubCompat
             android:id="@+id/player_overlay_tips"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -57,7 +57,7 @@
             android:visibility="invisible"
             android:src="@drawable/ic_cone_o" />
 
-        <android.support.v7.widget.ViewStubCompat
+        <androidx.appcompat.widget.ViewStubCompat
             android:id="@+id/player_info_stub"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -65,7 +65,7 @@
             android:layout_marginBottom="@dimen/default_margin"
             android:layout="@layout/player_overlay_info"/>
 
-        <android.support.v7.widget.ViewStubCompat
+        <androidx.appcompat.widget.ViewStubCompat
             android:id="@+id/player_overlay_settings_stub"
             android:layout="@layout/player_overlay_settings"
             android:layout_width="wrap_content"
@@ -74,7 +74,7 @@
             android:layout_alignParentRight="true"
             android:layout_marginRight="@dimen/default_margin" />
 
-        <android.support.v7.widget.ViewStubCompat
+        <androidx.appcompat.widget.ViewStubCompat
             android:id="@+id/player_hud_stub"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -86,7 +86,7 @@
 
     </RelativeLayout>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/video_playlist"
         android:layout_width="480dp"
         android:layout_height="wrap_content"
diff --git a/vlc-android/res/layout/player_hud.xml b/vlc-android/res/layout/player_hud.xml
index d295da6ed..de78391d7 100644
--- a/vlc-android/res/layout/player_hud.xml
+++ b/vlc-android/res/layout/player_hud.xml
@@ -6,7 +6,7 @@
         <import type="org.videolan.medialibrary.Tools" />
         <variable
             name="progress"
-            type="android.arch.lifecycle.LiveData&lt;org.videolan.vlc.media.Progress>" />
+            type="androidx.lifecycle.LiveData&lt;org.videolan.vlc.media.Progress>" />
         <variable
             name="player"
             type="org.videolan.vlc.gui.video.VideoPlayerActivity" />
diff --git a/vlc-android/res/layout/player_remote_control.xml b/vlc-android/res/layout/player_remote_control.xml
index 0fc5267e2..d4e87d472 100644
--- a/vlc-android/res/layout/player_remote_control.xml
+++ b/vlc-android/res/layout/player_remote_control.xml
@@ -46,7 +46,7 @@
             android:layout_centerInParent="true"
             android:src="@drawable/renderer_background_cone" />
 
-        <android.support.v7.widget.ViewStubCompat
+        <androidx.appcompat.widget.ViewStubCompat
             android:id="@+id/player_info_stub"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -71,7 +71,7 @@
 
         </RelativeLayout>
 
-        <android.support.v7.widget.ViewStubCompat
+        <androidx.appcompat.widget.ViewStubCompat
             android:id="@+id/player_overlay_settings_stub"
             android:layout="@layout/player_overlay_settings"
             android:layout_width="wrap_content"
@@ -83,7 +83,7 @@
             android:layout_marginEnd="@dimen/default_margin"
             android:layout_marginBottom="@dimen/default_margin"/>
 
-        <android.support.v7.widget.ViewStubCompat
+        <androidx.appcompat.widget.ViewStubCompat
             android:id="@+id/player_hud_stub"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -95,7 +95,7 @@
 
     </RelativeLayout>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/video_playlist"
         android:layout_width="480dp"
         android:layout_height="480dp"
diff --git a/vlc-android/res/layout/playlist_activity.xml b/vlc-android/res/layout/playlist_activity.xml
index 8c87d8e36..5db9a9992 100644
--- a/vlc-android/res/layout/playlist_activity.xml
+++ b/vlc-android/res/layout/playlist_activity.xml
@@ -8,18 +8,18 @@
             name="cover"
             type="android.graphics.drawable.BitmapDrawable"/>
     </data>
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:vlc="http://schemas.android.com/apk/res-auto"
         android:id="@+id/coordinator"
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
-        <android.support.design.widget.AppBarLayout
+        <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appbar"
             android:layout_width="match_parent"
             android:layout_height="200dp"
             android:fitsSystemWindows="true">
-            <android.support.design.widget.CollapsingToolbarLayout
+            <com.google.android.material.appbar.CollapsingToolbarLayout
                 android:id="@+id/collapsing_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -39,7 +39,7 @@
                     android:scaleType="centerCrop"
                     android:src="@{cover}"
                     vlc:layout_collapseMode="parallax" />
-                <android.support.v7.widget.Toolbar
+                <androidx.appcompat.widget.Toolbar
                     android:id="@+id/main_toolbar"
                     android:layout_width="match_parent"
                     android:layout_height="?attr/actionBarSize"
@@ -50,8 +50,8 @@
                     vlc:titleMarginStart="@dimen/default_margin"
                     vlc:layout_scrollFlags="scroll|enterAlways"
                     vlc:layout_collapseMode="pin"/>
-            </android.support.design.widget.CollapsingToolbarLayout>
-        </android.support.design.widget.AppBarLayout>
+            </com.google.android.material.appbar.CollapsingToolbarLayout>
+        </com.google.android.material.appbar.AppBarLayout>
 
         <FrameLayout
             android:id="@+id/container_list"
@@ -60,7 +60,7 @@
             vlc:layout_behavior="@string/appbar_scrolling_view_behavior"
             android:keyboardNavigationCluster="true"
             tools:targetApi="o"  >
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/songs"
                 android:layout_width="@dimen/default_content_width"
                 android:layout_height="match_parent"
@@ -73,7 +73,7 @@
                 android:background="?attr/background_default" />
         </FrameLayout>
 
-        <android.support.design.widget.FloatingActionButton
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
             vlc:rippleColor="@color/orange50"
             android:id="@+id/fab"
             android:layout_width="wrap_content"
@@ -86,5 +86,5 @@
             android:tint="@color/grey50" />
 
         <include layout="@layout/audioplayercontainer"/>
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </layout>
\ No newline at end of file
diff --git a/vlc-android/res/layout/preferences_activity.xml b/vlc-android/res/layout/preferences_activity.xml
index be6a91f3b..53372b661 100644
--- a/vlc-android/res/layout/preferences_activity.xml
+++ b/vlc-android/res/layout/preferences_activity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:vlc="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -12,4 +12,4 @@
         android:layout_width="fill_parent"
         android:layout_height="match_parent"
         vlc:layout_behavior="@string/appbar_scrolling_view_behavior" />
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/vlc-android/res/layout/search_activity.xml b/vlc-android/res/layout/search_activity.xml
index c1f70cd1d..5b286d2c7 100644
--- a/vlc-android/res/layout/search_activity.xml
+++ b/vlc-android/res/layout/search_activity.xml
@@ -28,7 +28,7 @@
                 android:layout_marginEnd="10dp"
                 android:scaleType="center"
                 android:onClick="@{handler::onBack}" />
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/search_edit_layout"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -43,7 +43,7 @@
                     android:inputType="textFilter"
                     android:textColor="?attr/font_default"
                     android:background="@android:color/transparent" />
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
             <ImageView
                 android:layout_width="40dp"
                 android:layout_height="40dp"
@@ -71,7 +71,7 @@
                     android:text="@string/albums"
                     android:textAppearance="@style/Result.Title"
                     android:visibility="@{searchAggregate.albums.length == 0 ? View.GONE : View.VISIBLE}"/>
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/albums_results"
                     style="@style/Result.List"
                     android:layout_width="match_parent"
@@ -85,7 +85,7 @@
                     android:textAppearance="@style/Result.Title"
                     android:text="@string/artists"
                     android:visibility="@{searchAggregate.artists.length == 0 ? View.GONE : View.VISIBLE}"/>
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/artists_results"
                     style="@style/Result.List"
                     android:layout_width="match_parent"
@@ -99,7 +99,7 @@
                     android:textAppearance="@style/Result.Title"
                     android:text="@string/genres"
                     android:visibility="@{searchAggregate.genres.length == 0 ? View.GONE : View.VISIBLE}"/>
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/genres_results"
                     style="@style/Result.List"
                     android:layout_width="match_parent"
@@ -113,7 +113,7 @@
                     android:textAppearance="@style/Result.Title"
                     android:text="@string/playlists"
                     android:visibility="@{searchAggregate.playlists.length == 0 ? View.GONE : View.VISIBLE}"/>
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/playlists_results"
                     style="@style/Result.List"
                     android:layout_width="match_parent"
@@ -127,7 +127,7 @@
                     android:textAppearance="@style/Result.Title"
                     android:text="@string/episodes"
                     android:visibility="@{View.GONE}"/>
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/episodes_results"
                     style="@style/Result.List"
                     android:layout_width="match_parent"
@@ -141,7 +141,7 @@
                     android:textAppearance="@style/Result.Title"
                     android:text="@string/movies"
                     android:visibility="@{View.GONE}"/>
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/movies_results"
                     style="@style/Result.List"
                     android:layout_width="match_parent"
@@ -155,7 +155,7 @@
                     android:textAppearance="@style/Result.Title"
                     android:text="@string/videos"
                     android:visibility="@{searchAggregate.videos.length == 0 ? View.GONE : View.VISIBLE}"/>
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/others_results"
                     style="@style/Result.List"
                     android:layout_width="match_parent"
@@ -169,7 +169,7 @@
                     android:textAppearance="@style/Result.Title"
                     android:text="@string/songs"
                     android:visibility="@{searchAggregate.tracks.length == 0 ? View.GONE : View.VISIBLE}"/>
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/songs_results"
                     style="@style/Result.List"
                     android:layout_width="match_parent"
diff --git a/vlc-android/res/layout/secondary.xml b/vlc-android/res/layout/secondary.xml
index be9cfb5af..ef10d179d 100644
--- a/vlc-android/res/layout/secondary.xml
+++ b/vlc-android/res/layout/secondary.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/coordinator"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -18,7 +18,7 @@
             android:keyboardNavigationCluster="true"
             tools:targetApi="o" />
 
-        <android.support.v7.widget.ViewStubCompat
+        <androidx.appcompat.widget.ViewStubCompat
             android:id="@+id/scan_viewstub"
             android:layout_width="match_parent"
             android:layout_height="@dimen/progress_layout_height"
@@ -27,7 +27,7 @@
 
         <include layout="@layout/audioplayercontainer"/>
 
-        <android.support.design.widget.FloatingActionButton
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
             vlc:borderWidth="0dp"
             vlc:rippleColor="@color/orange50"
             android:id="@+id/fab"
@@ -40,15 +40,15 @@
             vlc:layout_behavior="org.videolan.vlc.gui.helpers.FloatingActionButtonBehavior"
             android:visibility="invisible"
             android:layout_margin="16dp"/>
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-    <android.support.v7.widget.ViewStubCompat
+    <androidx.appcompat.widget.ViewStubCompat
         android:id="@+id/audio_playlist_tips"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout="@layout/audio_playlist_tips"/>
 
-    <android.support.v7.widget.ViewStubCompat
+    <androidx.appcompat.widget.ViewStubCompat
         android:id="@+id/audio_player_tips"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/vlc-android/res/layout/subtitle_download_fragment.xml b/vlc-android/res/layout/subtitle_download_fragment.xml
index 8bb69facd..c4802bda6 100644
--- a/vlc-android/res/layout/subtitle_download_fragment.xml
+++ b/vlc-android/res/layout/subtitle_download_fragment.xml
@@ -9,7 +9,7 @@
             type="org.videolan.vlc.viewmodels.SubtitlesModel"/>
     </data>
 
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/constraintLayout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content">
@@ -26,14 +26,14 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/language_list_spinner" />
 
-        <android.support.constraint.Guideline
+        <androidx.constraintlayout.widget.Guideline
             android:id="@+id/left_vertical_guideline"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             app:layout_constraintGuide_begin="16dp" />
 
-        <android.support.constraint.Guideline
+        <androidx.constraintlayout.widget.Guideline
             android:id="@+id/right_vertical_guideline"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -88,21 +88,21 @@
             app:layout_constraintStart_toStartOf="@+id/left_vertical_guideline"
             app:layout_constraintTop_toBottomOf="@+id/name"/>
 
-        <android.support.constraint.Barrier
+        <androidx.constraintlayout.widget.Barrier
             android:id="@+id/barrier"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:barrierDirection="bottom"
             app:constraint_referenced_ids="manual_search_checkBox,name,episode,season"/>
 
-        <android.support.constraint.Group
+        <androidx.constraintlayout.widget.Group
             android:id="@+id/manual_search_group"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:visibility="@{viewmodel.manualSearchEnabled ? View.VISIBLE : View.GONE}"
             app:constraint_referenced_ids="episode,season,name,search_button" />
 
-        <android.support.v4.widget.SwipeRefreshLayout
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/swipeContainer"
             android:layout_width="0dp"
             android:layout_height="0dp"
@@ -113,13 +113,13 @@
             app:layout_constraintEnd_toStartOf="@+id/right_vertical_guideline"
             app:layout_constraintStart_toStartOf="@+id/left_vertical_guideline"
             app:layout_constraintTop_toBottomOf="@id/barrier" >
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/subtitle_list"
                 android:focusable="true"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
                 app:layout_constraintHeight_default="wrap"/>
-        </android.support.v4.widget.SwipeRefreshLayout>
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
         <Button
             android:id="@+id/search_button"
@@ -133,7 +133,7 @@
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toEndOf="@+id/episode" />
 
-        <android.support.constraint.Guideline
+        <androidx.constraintlayout.widget.Guideline
             android:id="@+id/top_horizontal_guideline"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -176,5 +176,5 @@
             app:layout_constraintEnd_toStartOf="@+id/language_list_spinner"
             app:layout_constraintTop_toTopOf="@+id/top_horizontal_guideline" />
 
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/vlc-android/res/layout/subtitle_download_item.xml b/vlc-android/res/layout/subtitle_download_item.xml
index 47e8fb1eb..6b9627faf 100644
--- a/vlc-android/res/layout/subtitle_download_item.xml
+++ b/vlc-android/res/layout/subtitle_download_item.xml
@@ -9,7 +9,7 @@
             type="org.videolan.vlc.gui.dialogs.SubtitleItem"/>
     </data>
 
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="50dp"
@@ -72,11 +72,11 @@
             app:layout_constraintStart_toEndOf="@+id/download_sub"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <android.support.constraint.Barrier
+        <androidx.constraintlayout.widget.Barrier
             android:id="@+id/barrier"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:barrierDirection="start"
             app:constraint_referenced_ids="loading,download_sub" />
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/vlc-android/res/layout/subtitle_downloader_dialog.xml b/vlc-android/res/layout/subtitle_downloader_dialog.xml
index b3bf425bb..68ecd6df2 100644
--- a/vlc-android/res/layout/subtitle_downloader_dialog.xml
+++ b/vlc-android/res/layout/subtitle_downloader_dialog.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/constraintLayout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content">
@@ -19,7 +19,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"/>
 
-        <android.support.v4.view.ViewPager
+        <androidx.viewpager.widget.ViewPager
             android:id="@+id/pager"
             android:layout_width="@dimen/subs_dl_dialog_width"
             android:layout_height="@dimen/subs_dl_dialog_height"
@@ -28,7 +28,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tabLayout" />
 
-        <android.support.design.widget.TabLayout
+        <com.google.android.material.tabs.TabLayout
             style="@style/Widget.Design.TabLayout"
             android:id="@+id/tabLayout"
             android:layout_width="wrap_content"
@@ -39,7 +39,7 @@
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/movieName">
-        </android.support.design.widget.TabLayout>
+        </com.google.android.material.tabs.TabLayout>
 
         <Button
             android:id="@+id/nextButton"
@@ -51,5 +51,5 @@
             app:layout_constraintTop_toBottomOf="@id/pager"
             app:layout_constraintBottom_toBottomOf="parent"/>
 
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/vlc-android/res/layout/subtitle_history_fragment.xml b/vlc-android/res/layout/subtitle_history_fragment.xml
index c3240c811..e06862fa6 100644
--- a/vlc-android/res/layout/subtitle_history_fragment.xml
+++ b/vlc-android/res/layout/subtitle_history_fragment.xml
@@ -1,12 +1,12 @@
 <layout xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         tools:context="org.videolan.vlc.gui.dialogs.SubtitleHistoryFragment">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/subtitle_list"
             android:layout_width="0dp"
             android:layout_height="0dp"
@@ -20,5 +20,5 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/vlc-android/res/layout/tab_layout.xml b/vlc-android/res/layout/tab_layout.xml
index 6bc2628ff..a9267fcaf 100644
--- a/vlc-android/res/layout/tab_layout.xml
+++ b/vlc-android/res/layout/tab_layout.xml
@@ -1,4 +1,4 @@
-<android.support.design.widget.TabLayout
+<com.google.android.material.tabs.TabLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/sliding_tabs"
diff --git a/vlc-android/res/layout/toolbar.xml b/vlc-android/res/layout/toolbar.xml
index a3abd1e03..977906098 100644
--- a/vlc-android/res/layout/toolbar.xml
+++ b/vlc-android/res/layout/toolbar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.AppBarLayout
+<com.google.android.material.appbar.AppBarLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -9,7 +9,7 @@
     android:background="?attr/background_actionbar"
     app:theme="@style/Toolbar.VLC"
     android:fitsSystemWindows="true">
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/main_toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -21,7 +21,7 @@
         app:layout_scrollFlags="scroll|enterAlways"
         android:keyboardNavigationCluster="true"
         tools:targetApi="o" />
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/ariane"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -30,4 +30,4 @@
         android:visibility="gone"
         android:layout_marginStart="16dp"
         app:layout_scrollFlags="scroll|enterAlways" />
-</android.support.design.widget.AppBarLayout>
\ No newline at end of file
+</com.google.android.material.appbar.AppBarLayout>
\ No newline at end of file
diff --git a/vlc-android/res/layout/tv_audio_player.xml b/vlc-android/res/layout/tv_audio_player.xml
index 2f503182b..f9500c04e 100644
--- a/vlc-android/res/layout/tv_audio_player.xml
+++ b/vlc-android/res/layout/tv_audio_player.xml
@@ -3,9 +3,9 @@
     <data>
         <variable
             name="progress"
-            type="android.arch.lifecycle.LiveData&lt;org.videolan.vlc.viewmodels.PlaybackProgress>" />
+            type="androidx.lifecycle.LiveData&lt;org.videolan.vlc.viewmodels.PlaybackProgress>" />
     </data>
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
@@ -179,7 +179,7 @@
             tools:src="@drawable/ic_shuffle" />
 
         <!-- Playlist -->
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/playlist"
             android:layout_width="0dp"
             android:layout_height="0dp"
@@ -192,5 +192,5 @@
             android:nextFocusRight="@+id/playlist"
             android:nextFocusDown="@+id/playlist"
             android:layout_margin="@dimen/half_default_margin" />
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/vlc-android/res/layout/tv_main.xml b/vlc-android/res/layout/tv_main.xml
index 9960dc3f8..85975d986 100644
--- a/vlc-android/res/layout/tv_main.xml
+++ b/vlc-android/res/layout/tv_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/tv_container"
     android:layout_width="match_parent"
@@ -23,4 +23,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         android:visibility="gone" />
     <include layout="@layout/tv_time" />
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vlc-android/res/layout/tv_vertical_grid.xml b/vlc-android/res/layout/tv_vertical_grid.xml
index 17ea77d89..69f7182d5 100644
--- a/vlc-android/res/layout/tv_vertical_grid.xml
+++ b/vlc-android/res/layout/tv_vertical_grid.xml
@@ -1,4 +1,4 @@
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -36,4 +36,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
     <include layout="@layout/tv_time" />
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vlc-android/res/layout/video_grid.xml b/vlc-android/res/layout/video_grid.xml
index cee2ecb2a..9b3ba0e1c 100644
--- a/vlc-android/res/layout/video_grid.xml
+++ b/vlc-android/res/layout/video_grid.xml
@@ -6,7 +6,7 @@
             name="empty"
             type="boolean" />
     </data>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -113,5 +113,5 @@
             android:text="@string/load_3_period"
             android:textSize="20sp" />
     </ViewFlipper>
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/vlc-android/res/layout/video_grid_card.xml b/vlc-android/res/layout/video_grid_card.xml
index 87edeac0b..2aa64978d 100644
--- a/vlc-android/res/layout/video_grid_card.xml
+++ b/vlc-android/res/layout/video_grid_card.xml
@@ -23,7 +23,7 @@
 
         <variable
             name="showFilename"
-            type="android.databinding.ObservableBoolean" />
+            type="androidx.databinding.ObservableBoolean" />
 
         <variable
             name="max"
@@ -49,7 +49,7 @@
             name="holder"
             type="org.videolan.vlc.gui.video.VideoListAdapter.ViewHolder" />
     </data>
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="@dimen/grid_card_thumb_width"
         android:layout_height="@dimen/grid_card_thumb_height"
         android:clickable="true"
@@ -159,5 +159,5 @@
             android:progressDrawable="@drawable/gridview_progressbar"
             android:secondaryProgress="0"
             android:visibility="@{progress == 0 ? View.INVISIBLE : View.VISIBLE}" />
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/vlc-android/res/layout/video_list_card.xml b/vlc-android/res/layout/video_list_card.xml
index d01e36d8c..d6195b1c3 100644
--- a/vlc-android/res/layout/video_list_card.xml
+++ b/vlc-android/res/layout/video_list_card.xml
@@ -20,7 +20,7 @@
 
         <variable
             name="showFilename"
-            type="android.databinding.ObservableBoolean" />
+            type="androidx.databinding.ObservableBoolean" />
 
         <variable
             name="bgColor"
@@ -47,7 +47,7 @@
             type="org.videolan.vlc.gui.video.VideoListAdapter.ViewHolder" />
     </data>
 
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:clickable="true"
@@ -144,5 +144,5 @@
             android:secondaryProgress="@{max}"
             android:progressDrawable="?attr/gridview_progressbar"
             android:visibility="@{max == 0 ? View.INVISIBLE : View.VISIBLE}" />
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/vlc-android/res/layout/vlc_login_dialog.xml b/vlc-android/res/layout/vlc_login_dialog.xml
index 9141e0720..2e2ed33b2 100644
--- a/vlc-android/res/layout/vlc_login_dialog.xml
+++ b/vlc-android/res/layout/vlc_login_dialog.xml
@@ -23,7 +23,7 @@
                 android:layout_alignParentTop="true"
                 android:layout_margin="10dp"
                 android:text="@{dialog.text}"/>
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/login_container"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -38,8 +38,8 @@
                     android:text="@{dialog.getDefaultUsername()}"
                     android:inputType="textNoSuggestions"
                     android:singleLine="true" />
-            </android.support.design.widget.TextInputLayout>
-            <android.support.design.widget.TextInputLayout
+            </com.google.android.material.textfield.TextInputLayout>
+            <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/password_container"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -53,7 +53,7 @@
                     android:hint="@string/password"
                     android:inputType="textPassword"
                     android:singleLine="true" />
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
             <CheckBox
                 android:id="@+id/store"
                 android:layout_width="wrap_content"
diff --git a/vlc-android/res/layout/vlc_progress_dialog.xml b/vlc-android/res/layout/vlc_progress_dialog.xml
index a6eda6cfc..6f09a3621 100644
--- a/vlc-android/res/layout/vlc_progress_dialog.xml
+++ b/vlc-android/res/layout/vlc_progress_dialog.xml
@@ -20,7 +20,7 @@
                 android:layout_alignParentTop="true"
                 android:text="@{dialog.text}"
                 android:layout_margin="10dp" />
-            <android.support.v4.widget.ContentLoadingProgressBar
+            <androidx.core.widget.ContentLoadingProgressBar
                 android:id="@+id/progress"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/vlc-android/res/menu/activity_option.xml b/vlc-android/res/menu/activity_option.xml
index cfbf24a45..100c93412 100644
--- a/vlc-android/res/menu/activity_option.xml
+++ b/vlc-android/res/menu/activity_option.xml
@@ -14,7 +14,7 @@
         android:orderInCategory="1"
         android:id="@+id/ml_menu_filter"
         android:icon="@drawable/ic_menu_search_normal_w"
-        vlc:actionViewClass="android.support.v7.widget.SearchView"
+        vlc:actionViewClass="androidx.appcompat.widget.SearchView"
         android:title="@string/searchable_hint"
         vlc:showAsAction="always|collapseActionView"/>
     <item
diff --git a/vlc-android/res/xml/preferences_ui.xml b/vlc-android/res/xml/preferences_ui.xml
index b8a2c9763..bff4eabea 100644
--- a/vlc-android/res/xml/preferences_ui.xml
+++ b/vlc-android/res/xml/preferences_ui.xml
@@ -4,14 +4,14 @@
     android:key="ui_category"
     android:title="@string/interface_prefs_screen">
 
-    <android.support.v7.preference.SwitchPreferenceCompat
+    <androidx.preference.SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="enable_black_theme"
         android:summary="@string/enable_black_theme_summary"
         android:title="@string/enable_black_theme"
         android:disableDependentsState="true" />
 
-    <android.support.v7.preference.SwitchPreferenceCompat
+    <androidx.preference.SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="daynight"
         android:dependency="enable_black_theme"
diff --git a/vlc-android/src/org/videolan/vlc/DebugLogService.java b/vlc-android/src/org/videolan/vlc/DebugLogService.java
index 9f754d906..a669f04f3 100644
--- a/vlc-android/src/org/videolan/vlc/DebugLogService.java
+++ b/vlc-android/src/org/videolan/vlc/DebugLogService.java
@@ -32,7 +32,7 @@ import android.os.IBinder;
 import android.os.Looper;
 import android.os.RemoteCallbackList;
 import android.os.RemoteException;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
 import android.text.format.DateFormat;
 
 import org.videolan.vlc.gui.DebugLogActivity;
diff --git a/vlc-android/src/org/videolan/vlc/ExternalMonitor.java b/vlc-android/src/org/videolan/vlc/ExternalMonitor.java
index ccaacb4ff..440c4dfa0 100644
--- a/vlc-android/src/org/videolan/vlc/ExternalMonitor.java
+++ b/vlc-android/src/org/videolan/vlc/ExternalMonitor.java
@@ -24,11 +24,11 @@
 package org.videolan.vlc;
 
 import android.app.Activity;
-import android.arch.lifecycle.Lifecycle;
-import android.arch.lifecycle.LifecycleObserver;
-import android.arch.lifecycle.MutableLiveData;
-import android.arch.lifecycle.OnLifecycleEvent;
-import android.arch.lifecycle.ProcessLifecycleOwner;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.OnLifecycleEvent;
+import androidx.lifecycle.ProcessLifecycleOwner;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
diff --git a/vlc-android/src/org/videolan/vlc/MediaParsingService.kt b/vlc-android/src/org/videolan/vlc/MediaParsingService.kt
index 7fe263b7e..e18b3ddab 100644
--- a/vlc-android/src/org/videolan/vlc/MediaParsingService.kt
+++ b/vlc-android/src/org/videolan/vlc/MediaParsingService.kt
@@ -24,7 +24,7 @@ package org.videolan.vlc
 
 import android.annotation.SuppressLint
 import android.app.Service
-import android.arch.lifecycle.MutableLiveData
+import androidx.lifecycle.MutableLiveData
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
@@ -33,9 +33,9 @@ import android.net.Uri
 import android.os.Binder
 import android.os.IBinder
 import android.os.PowerManager
-import android.support.v4.app.NotificationManagerCompat
-import android.support.v4.content.ContextCompat
-import android.support.v4.content.LocalBroadcastManager
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.ContextCompat
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import android.text.TextUtils
 import android.util.Log
 import kotlinx.coroutines.experimental.*
@@ -57,7 +57,7 @@ private const val NOTIFICATION_DELAY = 1000L
 class MediaParsingService : Service(), DevicesDiscoveryCb, CoroutineScope {
     override val coroutineContext = Dispatchers.Main.immediate
     private lateinit var wakeLock: PowerManager.WakeLock
-    private lateinit var localBroadcastManager: LocalBroadcastManager
+    private lateinit var localBroadcastManager: androidx.localbroadcastmanager.content.LocalBroadcastManager
 
     private val binder = LocalBinder()
     private lateinit var medialibrary: Medialibrary
@@ -89,7 +89,7 @@ class MediaParsingService : Service(), DevicesDiscoveryCb, CoroutineScope {
     @SuppressLint("WakelockTimeout")
     override fun onCreate() {
         super.onCreate()
-        localBroadcastManager = LocalBroadcastManager.getInstance(this)
+        localBroadcastManager = androidx.localbroadcastmanager.content.LocalBroadcastManager.getInstance(this)
         medialibrary = Medialibrary.getInstance()
         medialibrary.addDeviceDiscoveryCb(this@MediaParsingService)
         val filter = IntentFilter()
diff --git a/vlc-android/src/org/videolan/vlc/PlaybackService.kt b/vlc-android/src/org/videolan/vlc/PlaybackService.kt
index 5c362b104..10de04306 100644
--- a/vlc-android/src/org/videolan/vlc/PlaybackService.kt
+++ b/vlc-android/src/org/videolan/vlc/PlaybackService.kt
@@ -28,15 +28,15 @@ import android.media.AudioManager
 import android.media.audiofx.AudioEffect
 import android.net.Uri
 import android.os.*
-import android.support.annotation.MainThread
-import android.support.v4.app.NotificationManagerCompat
-import android.support.v4.app.ServiceCompat
-import android.support.v4.content.ContextCompat
+import androidx.annotation.MainThread
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.app.ServiceCompat
+import androidx.core.content.ContextCompat
 import android.support.v4.media.MediaBrowserCompat
-import android.support.v4.media.MediaBrowserServiceCompat
+import androidx.media.MediaBrowserServiceCompat
 import android.support.v4.media.MediaDescriptionCompat
 import android.support.v4.media.MediaMetadataCompat
-import android.support.v4.media.session.MediaButtonReceiver
+import androidx.media.session.MediaButtonReceiver
 import android.support.v4.media.session.MediaSessionCompat
 import android.support.v4.media.session.PlaybackStateCompat
 import android.telephony.TelephonyManager
@@ -70,7 +70,7 @@ import java.util.*
 
 private const val TAG = "VLC/PlaybackService"
 
-class PlaybackService : MediaBrowserServiceCompat(), CoroutineScope {
+class PlaybackService : androidx.media.MediaBrowserServiceCompat(), CoroutineScope {
     override val coroutineContext = Dispatchers.Main.immediate
 
     lateinit var playlistManager: PlaylistManager
@@ -500,7 +500,7 @@ class PlaybackService : MediaBrowserServiceCompat(), CoroutineScope {
         if (AndroidUtil.isOOrLater && !isForeground && !VLCApplication.isForeground()) forceForeground()
         when (intent?.action) {
             Intent.ACTION_MEDIA_BUTTON -> {
-                if (AndroidDevices.hasTsp || AndroidDevices.hasPlayServices) MediaButtonReceiver.handleIntent(mediaSession, intent)
+                if (AndroidDevices.hasTsp || AndroidDevices.hasPlayServices) androidx.media.session.MediaButtonReceiver.handleIntent(mediaSession, intent)
             }
             ACTION_REMOTE_PLAYPAUSE,
             ACTION_REMOTE_PLAY,
@@ -534,7 +534,7 @@ class PlaybackService : MediaBrowserServiceCompat(), CoroutineScope {
     }
 
     override fun onBind(intent: Intent): IBinder? {
-        return if (MediaBrowserServiceCompat.SERVICE_INTERFACE == intent.action) super.onBind(intent) else mBinder
+        return if (androidx.media.MediaBrowserServiceCompat.SERVICE_INTERFACE == intent.action) super.onBind(intent) else mBinder
     }
 
     val vout : IVLCVout?
@@ -715,9 +715,9 @@ class PlaybackService : MediaBrowserServiceCompat(), CoroutineScope {
     private fun initMediaSession() {
         val mediaButtonIntent = Intent(Intent.ACTION_MEDIA_BUTTON)
 
-        mediaButtonIntent.setClass(this, MediaButtonReceiver::class.java)
+        mediaButtonIntent.setClass(this, androidx.media.session.MediaButtonReceiver::class.java)
         val mbrIntent = PendingIntent.getBroadcast(this, 0, mediaButtonIntent, 0)
-        val mbrName = ComponentName(this, MediaButtonReceiver::class.java)
+        val mbrName = ComponentName(this, androidx.media.session.MediaButtonReceiver::class.java)
 
         mediaSession = MediaSessionCompat(this, "VLC", mbrName, mbrIntent)
         mediaSession.setFlags(MediaSessionCompat.FLAG_HANDLES_MEDIA_BUTTONS or MediaSessionCompat.FLAG_HANDLES_TRANSPORT_CONTROLS)
@@ -1267,18 +1267,18 @@ class PlaybackService : MediaBrowserServiceCompat(), CoroutineScope {
      * Browsing
      */
 
-    override fun onGetRoot(clientPackageName: String, clientUid: Int, rootHints: Bundle?): MediaBrowserServiceCompat.BrowserRoot? {
-        return if (Permissions.canReadStorage(this@PlaybackService)) MediaBrowserServiceCompat.BrowserRoot(BrowserProvider.ID_ROOT, null) else null
+    override fun onGetRoot(clientPackageName: String, clientUid: Int, rootHints: Bundle?): androidx.media.MediaBrowserServiceCompat.BrowserRoot? {
+        return if (Permissions.canReadStorage(this@PlaybackService)) androidx.media.MediaBrowserServiceCompat.BrowserRoot(BrowserProvider.ID_ROOT, null) else null
     }
 
-    override fun onLoadChildren(parentId: String, result: MediaBrowserServiceCompat.Result<List<MediaBrowserCompat.MediaItem>>) {
+    override fun onLoadChildren(parentId: String, result: androidx.media.MediaBrowserServiceCompat.Result<List<MediaBrowserCompat.MediaItem>>) {
         result.detach()
         if (!medialibrary.isInitiated || libraryReceiver != null)
             registerMedialibrary(Runnable { sendResults(result, parentId) })
         else sendResults(result, parentId)
     }
 
-    private fun sendResults(result: MediaBrowserServiceCompat.Result<List<MediaBrowserCompat.MediaItem>>, parentId: String) {
+    private fun sendResults(result: androidx.media.MediaBrowserServiceCompat.Result<List<MediaBrowserCompat.MediaItem>>, parentId: String) {
         launch(Dispatchers.IO) {
             try {
                 result.sendResult(BrowserProvider.browse(applicationContext, parentId))
diff --git a/vlc-android/src/org/videolan/vlc/RecommendationsService.kt b/vlc-android/src/org/videolan/vlc/RecommendationsService.kt
index ceccba81b..c88e4679f 100644
--- a/vlc-android/src/org/videolan/vlc/RecommendationsService.kt
+++ b/vlc-android/src/org/videolan/vlc/RecommendationsService.kt
@@ -28,9 +28,9 @@ import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import android.os.Build
-import android.support.v4.app.NotificationCompat
-import android.support.v4.app.NotificationManagerCompat
-import android.support.v4.content.ContextCompat
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.ContextCompat
 import kotlinx.coroutines.experimental.*
 import kotlinx.coroutines.experimental.android.Main
 import org.videolan.medialibrary.media.MediaWrapper
diff --git a/vlc-android/src/org/videolan/vlc/RendererDelegate.kt b/vlc-android/src/org/videolan/vlc/RendererDelegate.kt
index 805fa4ef7..0b005a463 100644
--- a/vlc-android/src/org/videolan/vlc/RendererDelegate.kt
+++ b/vlc-android/src/org/videolan/vlc/RendererDelegate.kt
@@ -19,8 +19,8 @@
  */
 package org.videolan.vlc
 
-import android.arch.lifecycle.LiveData
-import android.arch.lifecycle.MutableLiveData
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import kotlinx.coroutines.experimental.Dispatchers
 import kotlinx.coroutines.experimental.launch
 import kotlinx.coroutines.experimental.withContext
diff --git a/vlc-android/src/org/videolan/vlc/StartActivity.java b/vlc-android/src/org/videolan/vlc/StartActivity.java
index acbc01abc..68a79ce85 100644
--- a/vlc-android/src/org/videolan/vlc/StartActivity.java
+++ b/vlc-android/src/org/videolan/vlc/StartActivity.java
@@ -29,8 +29,8 @@ import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.MediaStore;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.content.ContextCompat;
+import androidx.fragment.app.FragmentActivity;
+import androidx.core.content.ContextCompat;
 import android.text.TextUtils;
 
 import org.videolan.libvlc.util.AndroidUtil;
diff --git a/vlc-android/src/org/videolan/vlc/VLCApplication.java b/vlc-android/src/org/videolan/vlc/VLCApplication.java
index 0d6469a7d..9ba6c3674 100644
--- a/vlc-android/src/org/videolan/vlc/VLCApplication.java
+++ b/vlc-android/src/org/videolan/vlc/VLCApplication.java
@@ -21,14 +21,14 @@ package org.videolan.vlc;
 
 import android.annotation.SuppressLint;
 import android.app.Application;
-import android.arch.lifecycle.Lifecycle;
-import android.arch.lifecycle.ProcessLifecycleOwner;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.ProcessLifecycleOwner;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.content.res.Resources;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.util.SimpleArrayMap;
+import androidx.fragment.app.DialogFragment;
+import androidx.collection.SimpleArrayMap;
 import android.util.Log;
 
 import org.videolan.libvlc.Dialog;
diff --git a/vlc-android/src/org/videolan/vlc/database/BrowserFavDao.kt b/vlc-android/src/org/videolan/vlc/database/BrowserFavDao.kt
index 8b7583508..c18daecc1 100644
--- a/vlc-android/src/org/videolan/vlc/database/BrowserFavDao.kt
+++ b/vlc-android/src/org/videolan/vlc/database/BrowserFavDao.kt
@@ -20,11 +20,11 @@
 
 package org.videolan.vlc.database
 
-import android.arch.lifecycle.LiveData
-import android.arch.persistence.room.Dao
-import android.arch.persistence.room.Insert
-import android.arch.persistence.room.OnConflictStrategy
-import android.arch.persistence.room.Query
+import androidx.lifecycle.LiveData
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
 import android.net.Uri
 import org.videolan.vlc.database.models.BrowserFav
 
diff --git a/vlc-android/src/org/videolan/vlc/database/Converters.kt b/vlc-android/src/org/videolan/vlc/database/Converters.kt
index c3e719b49..74d80b6f2 100644
--- a/vlc-android/src/org/videolan/vlc/database/Converters.kt
+++ b/vlc-android/src/org/videolan/vlc/database/Converters.kt
@@ -20,7 +20,7 @@
 
 package org.videolan.vlc.database
 
-import android.arch.persistence.room.TypeConverter
+import androidx.room.TypeConverter
 import android.net.Uri
 import org.videolan.libvlc.Media
 import org.videolan.vlc.database.models.Slave
diff --git a/vlc-android/src/org/videolan/vlc/database/CustomDirectoryDao.kt b/vlc-android/src/org/videolan/vlc/database/CustomDirectoryDao.kt
index f3da201d4..c1548c638 100644
--- a/vlc-android/src/org/videolan/vlc/database/CustomDirectoryDao.kt
+++ b/vlc-android/src/org/videolan/vlc/database/CustomDirectoryDao.kt
@@ -1,6 +1,6 @@
 package org.videolan.vlc.database
 
-import android.arch.persistence.room.*
+import androidx.room.*
 import org.videolan.vlc.database.models.CustomDirectory
 
 @Dao
diff --git a/vlc-android/src/org/videolan/vlc/database/ExternalSubDao.kt b/vlc-android/src/org/videolan/vlc/database/ExternalSubDao.kt
index 5f86f7f2e..6db42fc09 100644
--- a/vlc-android/src/org/videolan/vlc/database/ExternalSubDao.kt
+++ b/vlc-android/src/org/videolan/vlc/database/ExternalSubDao.kt
@@ -20,8 +20,8 @@
 
 package org.videolan.vlc.database
 
-import android.arch.lifecycle.LiveData
-import android.arch.persistence.room.*
+import androidx.lifecycle.LiveData
+import androidx.room.*
 import org.videolan.vlc.database.models.ExternalSub
 
 
diff --git a/vlc-android/src/org/videolan/vlc/database/MediaDatabase.kt b/vlc-android/src/org/videolan/vlc/database/MediaDatabase.kt
index 015144095..835e50842 100644
--- a/vlc-android/src/org/videolan/vlc/database/MediaDatabase.kt
+++ b/vlc-android/src/org/videolan/vlc/database/MediaDatabase.kt
@@ -20,11 +20,11 @@
 
 package org.videolan.vlc.database
 
-import android.arch.persistence.db.SupportSQLiteDatabase
-import android.arch.persistence.room.Database
-import android.arch.persistence.room.Room
-import android.arch.persistence.room.RoomDatabase
-import android.arch.persistence.room.TypeConverters
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
+import androidx.room.TypeConverters
 import android.content.Context
 import org.videolan.tools.SingletonHolder
 import org.videolan.vlc.database.models.BrowserFav
diff --git a/vlc-android/src/org/videolan/vlc/database/Migrations.kt b/vlc-android/src/org/videolan/vlc/database/Migrations.kt
index 42cb7073f..4f9d668f5 100644
--- a/vlc-android/src/org/videolan/vlc/database/Migrations.kt
+++ b/vlc-android/src/org/videolan/vlc/database/Migrations.kt
@@ -20,8 +20,8 @@
 
 package org.videolan.vlc.database
 
-import android.arch.persistence.db.SupportSQLiteDatabase
-import android.arch.persistence.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.room.migration.Migration
 import android.content.Context
 import kotlinx.coroutines.experimental.Dispatchers
 import kotlinx.coroutines.experimental.GlobalScope
diff --git a/vlc-android/src/org/videolan/vlc/database/SlaveDao.kt b/vlc-android/src/org/videolan/vlc/database/SlaveDao.kt
index 7d7a46f6f..bb44f9564 100644
--- a/vlc-android/src/org/videolan/vlc/database/SlaveDao.kt
+++ b/vlc-android/src/org/videolan/vlc/database/SlaveDao.kt
@@ -20,10 +20,10 @@
 
 package org.videolan.vlc.database
 
-import android.arch.persistence.room.Dao
-import android.arch.persistence.room.Insert
-import android.arch.persistence.room.OnConflictStrategy
-import android.arch.persistence.room.Query
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
 import org.videolan.vlc.database.models.Slave
 
 @Dao
diff --git a/vlc-android/src/org/videolan/vlc/database/models/BrowserFav.kt b/vlc-android/src/org/videolan/vlc/database/models/BrowserFav.kt
index 7dd8ed11d..85a7bc5ad 100644
--- a/vlc-android/src/org/videolan/vlc/database/models/BrowserFav.kt
+++ b/vlc-android/src/org/videolan/vlc/database/models/BrowserFav.kt
@@ -20,9 +20,9 @@
 
 package org.videolan.vlc.database.models
 
-import android.arch.persistence.room.ColumnInfo
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.PrimaryKey
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
 import android.net.Uri
 
 @Entity(tableName = "fav_table")
diff --git a/vlc-android/src/org/videolan/vlc/database/models/CustomDirectory.kt b/vlc-android/src/org/videolan/vlc/database/models/CustomDirectory.kt
index 2c8775ed8..32079c0a3 100644
--- a/vlc-android/src/org/videolan/vlc/database/models/CustomDirectory.kt
+++ b/vlc-android/src/org/videolan/vlc/database/models/CustomDirectory.kt
@@ -1,7 +1,7 @@
 package org.videolan.vlc.database.models
 
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.PrimaryKey
+import androidx.room.Entity
+import androidx.room.PrimaryKey
 
 @Entity()
 data class CustomDirectory(
diff --git a/vlc-android/src/org/videolan/vlc/database/models/ExternalSub.kt b/vlc-android/src/org/videolan/vlc/database/models/ExternalSub.kt
index 3c451f235..4e621b394 100644
--- a/vlc-android/src/org/videolan/vlc/database/models/ExternalSub.kt
+++ b/vlc-android/src/org/videolan/vlc/database/models/ExternalSub.kt
@@ -20,7 +20,7 @@
 
 package org.videolan.vlc.database.models
 
-import android.arch.persistence.room.Entity
+import androidx.room.Entity
 
 @Entity(tableName = "external_subtitles_table", primaryKeys = ["mediaPath", "idSubtitle"])
 data class ExternalSub (
diff --git a/vlc-android/src/org/videolan/vlc/database/models/Slave.kt b/vlc-android/src/org/videolan/vlc/database/models/Slave.kt
index 11a331697..9b88a6fa8 100644
--- a/vlc-android/src/org/videolan/vlc/database/models/Slave.kt
+++ b/vlc-android/src/org/videolan/vlc/database/models/Slave.kt
@@ -20,9 +20,9 @@
 
 package org.videolan.vlc.database.models
 
-import android.arch.persistence.room.ColumnInfo
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.PrimaryKey
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
 
 @Entity(tableName = "SLAVES_table")
 data class Slave (
diff --git a/vlc-android/src/org/videolan/vlc/extensions/ExtensionManagerService.java b/vlc-android/src/org/videolan/vlc/extensions/ExtensionManagerService.java
index 21c2ed31c..ac4186ad6 100644
--- a/vlc-android/src/org/videolan/vlc/extensions/ExtensionManagerService.java
+++ b/vlc-android/src/org/videolan/vlc/extensions/ExtensionManagerService.java
@@ -33,7 +33,7 @@ import android.os.Binder;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.RemoteException;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
 
diff --git a/vlc-android/src/org/videolan/vlc/extensions/ExtensionsManager.java b/vlc-android/src/org/videolan/vlc/extensions/ExtensionsManager.java
index c00186b84..7c420b34e 100644
--- a/vlc-android/src/org/videolan/vlc/extensions/ExtensionsManager.java
+++ b/vlc-android/src/org/videolan/vlc/extensions/ExtensionsManager.java
@@ -11,8 +11,8 @@ import android.content.pm.ResolveInfo;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.design.widget.NavigationView;
-import android.support.v7.app.AlertDialog;
+import com.google.android.material.navigation.NavigationView;
+import androidx.appcompat.app.AlertDialog;
 import android.text.TextUtils;
 import android.view.MenuItem;
 
diff --git a/vlc-android/src/org/videolan/vlc/gui/AboutFragment.kt b/vlc-android/src/org/videolan/vlc/gui/AboutFragment.kt
index 85a2d334f..0178f008f 100644
--- a/vlc-android/src/org/videolan/vlc/gui/AboutFragment.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/AboutFragment.kt
@@ -21,10 +21,10 @@
 package org.videolan.vlc.gui
 
 import android.os.Bundle
-import android.support.design.widget.TabLayout
-import android.support.v4.app.Fragment
-import android.support.v4.view.ViewPager
-import android.support.v7.app.AppCompatActivity
+import com.google.android.material.tabs.TabLayout
+import androidx.fragment.app.Fragment
+import androidx.viewpager.widget.ViewPager
+import androidx.appcompat.app.AppCompatActivity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -46,10 +46,10 @@ import org.videolan.vlc.util.Util
 private const val TAG = "VLC/AboutFragment"
 private const val MODE_TOTAL = 2 // Number of audio browser modes
 
-class AboutFragment : Fragment() {
+class AboutFragment : androidx.fragment.app.Fragment() {
 
-    private lateinit var viewPager: ViewPager
-    private lateinit var tabLayout: TabLayout
+    private lateinit var viewPager: androidx.viewpager.widget.ViewPager
+    private lateinit var tabLayout: com.google.android.material.tabs.TabLayout
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         return inflater.inflate(R.layout.about, container, false)
diff --git a/vlc-android/src/org/videolan/vlc/gui/AudioPlayerContainerActivity.java b/vlc-android/src/org/videolan/vlc/gui/AudioPlayerContainerActivity.java
index 78ad62c2d..61ee12d83 100644
--- a/vlc-android/src/org/videolan/vlc/gui/AudioPlayerContainerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/AudioPlayerContainerActivity.java
@@ -23,21 +23,21 @@
 
 package org.videolan.vlc.gui;
 
-import android.arch.lifecycle.Observer;
+import androidx.lifecycle.Observer;
 import android.content.SharedPreferences;
 import android.media.AudioManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.widget.Toolbar;
-import android.support.v7.widget.ViewStubCompat;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.appbar.AppBarLayout;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.core.view.ViewCompat;
+import androidx.appcompat.widget.Toolbar;
+import androidx.appcompat.widget.ViewStubCompat;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
diff --git a/vlc-android/src/org/videolan/vlc/gui/BaseActivity.java b/vlc-android/src/org/videolan/vlc/gui/BaseActivity.java
index 252c991be..130fd416b 100644
--- a/vlc-android/src/org/videolan/vlc/gui/BaseActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/BaseActivity.java
@@ -2,9 +2,9 @@ package org.videolan.vlc.gui;
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.app.AppCompatDelegate;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
 
 import org.videolan.vlc.R;
 import org.videolan.vlc.VLCApplication;
diff --git a/vlc-android/src/org/videolan/vlc/gui/ContentActivity.java b/vlc-android/src/org/videolan/vlc/gui/ContentActivity.java
index e9154579e..86b751984 100644
--- a/vlc-android/src/org/videolan/vlc/gui/ContentActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/ContentActivity.java
@@ -25,12 +25,12 @@ package org.videolan.vlc.gui;
 
 import android.annotation.SuppressLint;
 import android.app.SearchManager;
-import android.arch.lifecycle.Observer;
+import androidx.lifecycle.Observer;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.SearchView;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.appcompat.widget.SearchView;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
diff --git a/vlc-android/src/org/videolan/vlc/gui/DialogActivity.java b/vlc-android/src/org/videolan/vlc/gui/DialogActivity.java
index 80cecdf1c..c98202acc 100644
--- a/vlc-android/src/org/videolan/vlc/gui/DialogActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/DialogActivity.java
@@ -24,7 +24,7 @@
 package org.videolan.vlc.gui;
 
 import android.os.Bundle;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
 import android.text.TextUtils;
 
 import org.videolan.vlc.gui.dialogs.NetworkServerDialog;
diff --git a/vlc-android/src/org/videolan/vlc/gui/DiffUtilAdapter.kt b/vlc-android/src/org/videolan/vlc/gui/DiffUtilAdapter.kt
index f576399e5..a81cf15b1 100644
--- a/vlc-android/src/org/videolan/vlc/gui/DiffUtilAdapter.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/DiffUtilAdapter.kt
@@ -1,8 +1,8 @@
 package org.videolan.vlc.gui
 
-import android.support.annotation.MainThread
-import android.support.v7.util.DiffUtil
-import android.support.v7.widget.RecyclerView
+import androidx.annotation.MainThread
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView
 import kotlinx.coroutines.experimental.CoroutineScope
 import kotlinx.coroutines.experimental.Dispatchers
 import kotlinx.coroutines.experimental.android.Main
@@ -10,7 +10,7 @@ import kotlinx.coroutines.experimental.channels.Channel
 import kotlinx.coroutines.experimental.channels.actor
 import kotlinx.coroutines.experimental.withContext
 
-abstract class DiffUtilAdapter<D, VH : RecyclerView.ViewHolder> : RecyclerView.Adapter<VH>(), CoroutineScope {
+abstract class DiffUtilAdapter<D, VH : androidx.recyclerview.widget.RecyclerView.ViewHolder> : androidx.recyclerview.widget.RecyclerView.Adapter<VH>(), CoroutineScope {
     override val coroutineContext = Dispatchers.Main.immediate
 
     protected var dataset: List<D> = listOf()
diff --git a/vlc-android/src/org/videolan/vlc/gui/HistoryFragment.java b/vlc-android/src/org/videolan/vlc/gui/HistoryFragment.java
index 5dd4b104d..dd2709e40 100644
--- a/vlc-android/src/org/videolan/vlc/gui/HistoryFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/HistoryFragment.java
@@ -20,14 +20,14 @@
 package org.videolan.vlc.gui;
 
 import android.annotation.TargetApi;
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.view.ActionMode;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.appcompat.view.ActionMode;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
diff --git a/vlc-android/src/org/videolan/vlc/gui/InfoActivity.java b/vlc-android/src/org/videolan/vlc/gui/InfoActivity.java
index 728ca3e2d..d9be0cf4d 100644
--- a/vlc-android/src/org/videolan/vlc/gui/InfoActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/InfoActivity.java
@@ -1,7 +1,7 @@
 package org.videolan.vlc.gui;
 
 
-import android.databinding.DataBindingUtil;
+import androidx.databinding.DataBindingUtil;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
@@ -9,11 +9,11 @@ import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.annotation.Nullable;
-import android.support.design.widget.BottomSheetBehavior;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.annotation.Nullable;
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.View;
diff --git a/vlc-android/src/org/videolan/vlc/gui/MainActivity.java b/vlc-android/src/org/videolan/vlc/gui/MainActivity.java
index 7f4d54d8e..ebc6297bf 100644
--- a/vlc-android/src/org/videolan/vlc/gui/MainActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/MainActivity.java
@@ -29,14 +29,14 @@ import android.database.Cursor;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.NavigationView;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.GravityCompat;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.view.ActionMode;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.navigation.NavigationView;
+import androidx.fragment.app.Fragment;
+import androidx.core.view.GravityCompat;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.view.ActionMode;
 import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.MenuItem;
diff --git a/vlc-android/src/org/videolan/vlc/gui/PlaybackServiceActivity.java b/vlc-android/src/org/videolan/vlc/gui/PlaybackServiceActivity.java
index a8a23ec39..06175b4a1 100644
--- a/vlc-android/src/org/videolan/vlc/gui/PlaybackServiceActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/PlaybackServiceActivity.java
@@ -23,8 +23,8 @@
 package org.videolan.vlc.gui;
 
 import android.content.Context;
-import android.support.annotation.MainThread;
-import android.support.v4.app.FragmentActivity;
+import androidx.annotation.MainThread;
+import androidx.fragment.app.FragmentActivity;
 
 import org.videolan.vlc.PlaybackService;
 
diff --git a/vlc-android/src/org/videolan/vlc/gui/PlaybackServiceFragment.java b/vlc-android/src/org/videolan/vlc/gui/PlaybackServiceFragment.java
index 2ccd902aa..cc734265f 100644
--- a/vlc-android/src/org/videolan/vlc/gui/PlaybackServiceFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/PlaybackServiceFragment.java
@@ -23,7 +23,7 @@
 package org.videolan.vlc.gui;
 
 import android.app.Activity;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import org.videolan.vlc.PlaybackService;
 import org.videolan.vlc.gui.video.VideoPlayerActivity;
diff --git a/vlc-android/src/org/videolan/vlc/gui/PlaylistActivity.java b/vlc-android/src/org/videolan/vlc/gui/PlaylistActivity.java
index b1bce60f9..069361eec 100644
--- a/vlc-android/src/org/videolan/vlc/gui/PlaylistActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/PlaylistActivity.java
@@ -24,23 +24,23 @@
 package org.videolan.vlc.gui;
 
 import android.annotation.TargetApi;
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
-import android.arch.paging.PagedList;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
+import androidx.paging.PagedList;
 import android.content.Intent;
-import android.databinding.DataBindingUtil;
+import androidx.databinding.DataBindingUtil;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.design.widget.BottomSheetBehavior;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.view.ActionMode;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.core.view.ViewCompat;
+import androidx.appcompat.view.ActionMode;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.Menu;
diff --git a/vlc-android/src/org/videolan/vlc/gui/SearchActivity.java b/vlc-android/src/org/videolan/vlc/gui/SearchActivity.java
index 3dd9f6400..9cb034028 100644
--- a/vlc-android/src/org/videolan/vlc/gui/SearchActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/SearchActivity.java
@@ -5,13 +5,13 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.databinding.DataBindingUtil;
+import androidx.databinding.DataBindingUtil;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
diff --git a/vlc-android/src/org/videolan/vlc/gui/SearchResultAdapter.java b/vlc-android/src/org/videolan/vlc/gui/SearchResultAdapter.java
index 11da5f46b..519c2c195 100644
--- a/vlc-android/src/org/videolan/vlc/gui/SearchResultAdapter.java
+++ b/vlc-android/src/org/videolan/vlc/gui/SearchResultAdapter.java
@@ -1,6 +1,6 @@
 package org.videolan.vlc.gui;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
diff --git a/vlc-android/src/org/videolan/vlc/gui/SecondaryActivity.java b/vlc-android/src/org/videolan/vlc/gui/SecondaryActivity.java
index 32a7c93e4..0424f5a4d 100644
--- a/vlc-android/src/org/videolan/vlc/gui/SecondaryActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/SecondaryActivity.java
@@ -25,9 +25,9 @@ package org.videolan.vlc.gui;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.v4.app.Fragment;
+import com.google.android.material.appbar.AppBarLayout;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.fragment.app.Fragment;
 import android.view.MenuItem;
 import android.view.View;
 
diff --git a/vlc-android/src/org/videolan/vlc/gui/SimpleAdapter.kt b/vlc-android/src/org/videolan/vlc/gui/SimpleAdapter.kt
index 91528ee12..f70f3008b 100644
--- a/vlc-android/src/org/videolan/vlc/gui/SimpleAdapter.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/SimpleAdapter.kt
@@ -1,8 +1,8 @@
 package org.videolan.vlc.gui
 
-import android.support.v7.recyclerview.extensions.ListAdapter
-import android.support.v7.util.DiffUtil
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import org.videolan.medialibrary.media.MediaLibraryItem
@@ -32,7 +32,7 @@ class SimpleAdapter(val handler: ClickHandler) : ListAdapter<MediaLibraryItem, S
 
     fun isEmpty() = itemCount == 0
 
-    class ViewHolder(handler: ClickHandler, val binding: SimpleItemBinding) : RecyclerView.ViewHolder(binding.root) {
+    class ViewHolder(handler: ClickHandler, val binding: SimpleItemBinding) : androidx.recyclerview.widget.RecyclerView.ViewHolder(binding.root) {
         init {
             binding.handler = handler
         }
diff --git a/vlc-android/src/org/videolan/vlc/gui/audio/AudioAlbumsSongsFragment.java b/vlc-android/src/org/videolan/vlc/gui/audio/AudioAlbumsSongsFragment.java
index 5fbb8677f..5b36466ef 100644
--- a/vlc-android/src/org/videolan/vlc/gui/audio/AudioAlbumsSongsFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/audio/AudioAlbumsSongsFragment.java
@@ -21,21 +21,21 @@
 package org.videolan.vlc.gui.audio;
 
 import android.app.Activity;
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
-import android.arch.paging.PagedList;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
+import androidx.paging.PagedList;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.view.ViewPager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.tabs.TabLayout;
+import androidx.fragment.app.FragmentActivity;
+import androidx.viewpager.widget.ViewPager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
diff --git a/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserAdapter.java b/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserAdapter.java
index 16e351a15..1605981bd 100644
--- a/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserAdapter.java
+++ b/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserAdapter.java
@@ -24,15 +24,15 @@
 package org.videolan.vlc.gui.audio;
 
 import android.annotation.TargetApi;
-import android.arch.paging.PagedList;
-import android.arch.paging.PagedListAdapter;
+import androidx.paging.PagedList;
+import androidx.paging.PagedListAdapter;
 import android.content.Context;
-import android.databinding.ViewDataBinding;
+import androidx.databinding.ViewDataBinding;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.util.DiffUtil;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.DiffUtil;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserFragment.java b/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserFragment.java
index b20c883b6..cd07e70b2 100644
--- a/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserFragment.java
@@ -20,20 +20,20 @@
 
 package org.videolan.vlc.gui.audio;
 
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
-import android.arch.paging.PagedList;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
+import androidx.paging.PagedList;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
-import android.support.v4.view.ViewPager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import com.google.android.material.tabs.TabLayout;
+import androidx.viewpager.widget.ViewPager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MotionEvent;
diff --git a/vlc-android/src/org/videolan/vlc/gui/audio/AudioPagerAdapter.java b/vlc-android/src/org/videolan/vlc/gui/audio/AudioPagerAdapter.java
index 8eca8cdb0..b467822e7 100644
--- a/vlc-android/src/org/videolan/vlc/gui/audio/AudioPagerAdapter.java
+++ b/vlc-android/src/org/videolan/vlc/gui/audio/AudioPagerAdapter.java
@@ -23,7 +23,7 @@
 package org.videolan.vlc.gui.audio;
 
 import android.database.DataSetObserver;
-import android.support.v4.view.PagerAdapter;
+import androidx.viewpager.widget.PagerAdapter;
 import android.view.View;
 import android.view.ViewGroup;
 
diff --git a/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.kt b/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.kt
index aed9fc9c8..9f7ad0cd0 100644
--- a/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.kt
@@ -22,23 +22,23 @@ package org.videolan.vlc.gui.audio
 
 import android.Manifest
 import android.annotation.TargetApi
-import android.arch.lifecycle.Observer
+import androidx.lifecycle.Observer
 import android.content.Context
 import android.content.SharedPreferences
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
-import android.support.annotation.MainThread
-import android.support.annotation.RequiresPermission
-import android.support.constraint.ConstraintSet
-import android.support.design.widget.BottomSheetBehavior
-import android.support.design.widget.Snackbar
-import android.support.transition.AutoTransition
-import android.support.transition.TransitionManager
-import android.support.v4.app.Fragment
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.helper.ItemTouchHelper
+import androidx.annotation.MainThread
+import androidx.annotation.RequiresPermission
+import androidx.constraintlayout.widget.ConstraintSet
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.snackbar.Snackbar
+import androidx.transition.AutoTransition
+import androidx.transition.TransitionManager
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.ItemTouchHelper
 import android.text.Editable
 import android.text.TextUtils
 import android.text.TextWatcher
@@ -79,7 +79,7 @@ private const val TAG = "VLC/AudioPlayer"
 private const val SEARCH_TIMEOUT_MILLIS = 5000
 
 @Suppress("UNUSED_PARAMETER")
-class AudioPlayer : Fragment(), PlaylistAdapter.IPlayer, TextWatcher, PlaybackService.Client.Callback {
+class AudioPlayer : androidx.fragment.app.Fragment(), PlaylistAdapter.IPlayer, TextWatcher, PlaybackService.Client.Callback {
 
     private lateinit var binding: AudioPlayerBinding
     private lateinit var playlistAdapter: PlaylistAdapter
@@ -125,7 +125,7 @@ class AudioPlayer : Fragment(), PlaylistAdapter.IPlayer, TextWatcher, PlaybackSe
         super.onViewCreated(view, savedInstanceState)
         DEFAULT_BACKGROUND_DARKER_ID = UiTools.getResourceFromAttribute(view.context, R.attr.background_default_darker)
         DEFAULT_BACKGROUND_ID = UiTools.getResourceFromAttribute(view.context, R.attr.background_default)
-        binding.songsList.layoutManager = LinearLayoutManager(view.context)
+        binding.songsList.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(view.context)
         binding.songsList.adapter = playlistAdapter
         binding.audioMediaSwitcher.setAudioMediaSwitcherListener(headerMediaSwitcherListener)
         binding.coverMediaSwitcher.setAudioMediaSwitcherListener(mCoverMediaSwitcherListener)
@@ -283,7 +283,7 @@ class AudioPlayer : Fragment(), PlaylistAdapter.IPlayer, TextWatcher, PlaybackSe
                         binding.backgroundView.setImageBitmap(blurredCover)
                         binding.backgroundView.visibility = View.VISIBLE
                         binding.songsList.setBackgroundResource(0)
-                        if (playerState == BottomSheetBehavior.STATE_EXPANDED) binding.header.setBackgroundResource(0)
+                        if (playerState == com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED) binding.header.setBackgroundResource(0)
                     } else setDefaultBackground()
                 }
             }
@@ -300,7 +300,7 @@ class AudioPlayer : Fragment(), PlaylistAdapter.IPlayer, TextWatcher, PlaybackSe
     }
 
     override fun onSelectionSet(position: Int) {
-        if (playerState != BottomSheetBehavior.STATE_COLLAPSED && playerState != BottomSheetBehavior.STATE_HIDDEN) {
+        if (playerState != com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_COLLAPSED && playerState != com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HIDDEN) {
             binding.songsList.scrollToPosition(position)
         }
     }
@@ -327,14 +327,14 @@ class AudioPlayer : Fragment(), PlaylistAdapter.IPlayer, TextWatcher, PlaybackSe
     fun onNextClick(view: View) {
         service?.run {
             if (hasNext()) next()
-            else Snackbar.make(binding.root, R.string.lastsong, Snackbar.LENGTH_SHORT).show()
+            else com.google.android.material.snackbar.Snackbar.make(binding.root, R.string.lastsong, com.google.android.material.snackbar.Snackbar.LENGTH_SHORT).show()
         }
     }
 
     fun onPreviousClick(view: View) {
         service?.run {
             if (hasPrevious() || isSeekable) previous(false)
-            else Snackbar.make(binding.root, R.string.firstsong, Snackbar.LENGTH_SHORT).show()
+            else com.google.android.material.snackbar.Snackbar.make(binding.root, R.string.firstsong, com.google.android.material.snackbar.Snackbar.LENGTH_SHORT).show()
         }
     }
 
@@ -403,16 +403,16 @@ class AudioPlayer : Fragment(), PlaylistAdapter.IPlayer, TextWatcher, PlaybackSe
         binding.progressBar.visibility = if (progressBarVisible) View.VISIBLE else View.GONE
         val cl = binding.header
         TransitionManager.beginDelayedTransition(cl, AutoTransition().setDuration(200))
-        ConstraintSet().apply {
+        androidx.constraintlayout.widget.ConstraintSet().apply {
             clone(cl)
-            setVisibility(R.id.playlist_ab_repeat, if (abVisible) ConstraintSet.VISIBLE else ConstraintSet.GONE)
-            setVisibility(R.id.playlist_search, if (searchVisible) ConstraintSet.VISIBLE else ConstraintSet.GONE)
-            setVisibility(R.id.playlist_switch, if (playlistSwitchVisible) ConstraintSet.VISIBLE else ConstraintSet.GONE)
-            setVisibility(R.id.adv_function, if (advFuncVisible) ConstraintSet.VISIBLE else ConstraintSet.GONE)
-            setVisibility(R.id.header_play_pause, if (headerPlayPauseVisible) ConstraintSet.VISIBLE else ConstraintSet.GONE)
-            setVisibility(R.id.header_time, if (headerTimeVisible) ConstraintSet.VISIBLE else ConstraintSet.GONE)
-            setVisibility(R.id.playlist_search_text, if (searchTextVisible) ConstraintSet.VISIBLE else ConstraintSet.GONE)
-            setVisibility(R.id.audio_media_switcher, if (searchTextVisible) ConstraintSet.GONE else ConstraintSet.VISIBLE)
+            setVisibility(R.id.playlist_ab_repeat, if (abVisible) androidx.constraintlayout.widget.ConstraintSet.VISIBLE else androidx.constraintlayout.widget.ConstraintSet.GONE)
+            setVisibility(R.id.playlist_search, if (searchVisible) androidx.constraintlayout.widget.ConstraintSet.VISIBLE else androidx.constraintlayout.widget.ConstraintSet.GONE)
+            setVisibility(R.id.playlist_switch, if (playlistSwitchVisible) androidx.constraintlayout.widget.ConstraintSet.VISIBLE else androidx.constraintlayout.widget.ConstraintSet.GONE)
+            setVisibility(R.id.adv_function, if (advFuncVisible) androidx.constraintlayout.widget.ConstraintSet.VISIBLE else androidx.constraintlayout.widget.ConstraintSet.GONE)
+            setVisibility(R.id.header_play_pause, if (headerPlayPauseVisible) androidx.constraintlayout.widget.ConstraintSet.VISIBLE else androidx.constraintlayout.widget.ConstraintSet.GONE)
+            setVisibility(R.id.header_time, if (headerTimeVisible) androidx.constraintlayout.widget.ConstraintSet.VISIBLE else androidx.constraintlayout.widget.ConstraintSet.GONE)
+            setVisibility(R.id.playlist_search_text, if (searchTextVisible) androidx.constraintlayout.widget.ConstraintSet.VISIBLE else androidx.constraintlayout.widget.ConstraintSet.GONE)
+            setVisibility(R.id.audio_media_switcher, if (searchTextVisible) androidx.constraintlayout.widget.ConstraintSet.GONE else androidx.constraintlayout.widget.ConstraintSet.VISIBLE)
             applyTo(cl)
         }
     }
@@ -445,7 +445,7 @@ class AudioPlayer : Fragment(), PlaylistAdapter.IPlayer, TextWatcher, PlaybackSe
             addTextChangedListener(this@AudioPlayer)
         }
         UiTools.setKeyboardVisibility(binding.playlistSearchText, false)
-        if (playerState == BottomSheetBehavior.STATE_COLLAPSED) setHeaderVisibilities(false, false, true, true, true, false, false)
+        if (playerState == com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_COLLAPSED) setHeaderVisibilities(false, false, true, true, true, false, false)
         else setHeaderVisibilities(true, true, false, false, false, true, true)
         return true
     }
@@ -568,12 +568,12 @@ class AudioPlayer : Fragment(), PlaylistAdapter.IPlayer, TextWatcher, PlaybackSe
     fun onStateChanged(newState: Int) {
         playerState = newState
         when (newState) {
-            BottomSheetBehavior.STATE_COLLAPSED -> {
+            com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_COLLAPSED -> {
                 hideSearchField()
                 binding.header.setBackgroundResource(DEFAULT_BACKGROUND_DARKER_ID)
                 setHeaderVisibilities(false, false, true, true, true, false, false)
             }
-            BottomSheetBehavior.STATE_EXPANDED -> {
+            com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED -> {
                 binding.header.setBackgroundResource(0)
                 setHeaderVisibilities(true, true, false, false, false, true, true)
                 showPlaylistTips()
diff --git a/vlc-android/src/org/videolan/vlc/gui/audio/BaseAudioBrowser.java b/vlc-android/src/org/videolan/vlc/gui/audio/BaseAudioBrowser.java
index 35091865e..2da124439 100644
--- a/vlc-android/src/org/videolan/vlc/gui/audio/BaseAudioBrowser.java
+++ b/vlc-android/src/org/videolan/vlc/gui/audio/BaseAudioBrowser.java
@@ -23,9 +23,9 @@
 
 package org.videolan.vlc.gui.audio;
 
-import android.support.annotation.NonNull;
-import android.support.v7.view.ActionMode;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.view.ActionMode;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
diff --git a/vlc-android/src/org/videolan/vlc/gui/audio/EqualizerFragment.java b/vlc-android/src/org/videolan/vlc/gui/audio/EqualizerFragment.java
index a65daac23..40ec9c8f5 100644
--- a/vlc-android/src/org/videolan/vlc/gui/audio/EqualizerFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/audio/EqualizerFragment.java
@@ -21,12 +21,12 @@ package org.videolan.vlc.gui.audio;
 
 import android.content.Context;
 import android.content.DialogInterface;
-import android.databinding.DataBindingUtil;
-import android.databinding.ObservableInt;
+import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ObservableInt;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatDialogFragment;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatDialogFragment;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/vlc-android/src/org/videolan/vlc/gui/audio/PlaylistAdapter.java b/vlc-android/src/org/videolan/vlc/gui/audio/PlaylistAdapter.java
index ba1b563c8..c3ec9c73f 100644
--- a/vlc-android/src/org/videolan/vlc/gui/audio/PlaylistAdapter.java
+++ b/vlc-android/src/org/videolan/vlc/gui/audio/PlaylistAdapter.java
@@ -25,12 +25,12 @@ package org.videolan.vlc.gui.audio;
 
 import android.annotation.TargetApi;
 import android.content.Context;
-import android.databinding.DataBindingUtil;
+import androidx.databinding.DataBindingUtil;
 import android.os.Build;
 import android.os.Message;
-import android.support.annotation.MainThread;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.MainThread;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserAdapter.java b/vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserAdapter.java
index 760c1a2d5..19082c638 100644
--- a/vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserAdapter.java
+++ b/vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserAdapter.java
@@ -23,7 +23,7 @@
 package org.videolan.vlc.gui.browser;
 
 import android.annotation.TargetApi;
-import android.databinding.ViewDataBinding;
+import androidx.databinding.ViewDataBinding;
 import android.graphics.BitmapFactory;
 import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
diff --git a/vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserFragment.kt b/vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserFragment.kt
index 083980759..8440e43e1 100644
--- a/vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserFragment.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserFragment.kt
@@ -22,19 +22,19 @@
  */
 package org.videolan.vlc.gui.browser
 
-import android.arch.lifecycle.Observer
+import androidx.lifecycle.Observer
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.os.Message
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentManager
-import android.support.v4.content.ContextCompat
-import android.support.v4.widget.SwipeRefreshLayout
-import android.support.v7.view.ActionMode
-import android.support.v7.widget.DividerItemDecoration
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.core.content.ContextCompat
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import androidx.appcompat.view.ActionMode
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import android.text.TextUtils
 import android.view.*
 import kotlinx.coroutines.experimental.*
@@ -67,10 +67,10 @@ private const val MSG_SHOW_LOADING = 0
 internal const val MSG_HIDE_LOADING = 1
 private const val MSG_REFRESH = 3
 
-abstract class BaseBrowserFragment : MediaBrowserFragment<BrowserModel>(), IRefreshable, SwipeRefreshLayout.OnRefreshListener, View.OnClickListener, IEventsHandler, CtxActionReceiver {
+abstract class BaseBrowserFragment : MediaBrowserFragment<BrowserModel>(), IRefreshable, androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener, View.OnClickListener, IEventsHandler, CtxActionReceiver {
 
     protected val handler = BrowserFragmentHandler(this)
-    private lateinit var layoutManager: LinearLayoutManager
+    private lateinit var layoutManager: androidx.recyclerview.widget.LinearLayoutManager
     var mrl: String? = null
     protected var currentMedia: MediaWrapper? = null
     private var savedPosition = -1
@@ -84,7 +84,7 @@ abstract class BaseBrowserFragment : MediaBrowserFragment<BrowserModel>(), IRefr
     protected lateinit var browserFavRepository: BrowserFavRepository
 
 
-    protected abstract fun createFragment(): Fragment
+    protected abstract fun createFragment(): androidx.fragment.app.Fragment
     protected abstract fun browseRoot()
 
     override fun onCreate(bundle: Bundle?) {
@@ -123,7 +123,7 @@ abstract class BaseBrowserFragment : MediaBrowserFragment<BrowserModel>(), IRefr
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         if (!this::adapter.isInitialized) adapter = BaseBrowserAdapter(this)
-        layoutManager = LinearLayoutManager(activity)
+        layoutManager = androidx.recyclerview.widget.LinearLayoutManager(activity)
         binding.networkList.layoutManager = layoutManager
         binding.networkList.adapter = adapter
         registerSwiperRefreshlayout()
@@ -134,14 +134,14 @@ abstract class BaseBrowserFragment : MediaBrowserFragment<BrowserModel>(), IRefr
     open fun registerSwiperRefreshlayout() = mSwipeRefreshLayout.setOnRefreshListener(this)
 
     override fun setBreadcrumb() {
-        val ariane = requireActivity().findViewById<RecyclerView>(R.id.ariane) ?: return
+        val ariane = requireActivity().findViewById<androidx.recyclerview.widget.RecyclerView>(R.id.ariane) ?: return
         val media = currentMedia
         if (media != null && isSchemeSupported(media.uri?.scheme)) {
             ariane.visibility = View.VISIBLE
-            ariane.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
+            ariane.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(requireContext(), androidx.recyclerview.widget.LinearLayoutManager.HORIZONTAL, false)
             ariane.adapter = PathAdapter(this, media)
             if (ariane.itemDecorationCount == 0) {
-                val did = DividerItemDecoration(requireContext(), DividerItemDecoration.HORIZONTAL)
+                val did = androidx.recyclerview.widget.DividerItemDecoration(requireContext(), androidx.recyclerview.widget.DividerItemDecoration.HORIZONTAL)
                 did.setDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.divider_grey_50_18dp)!!)
                 ariane.addItemDecoration(did)
             }
@@ -150,7 +150,7 @@ abstract class BaseBrowserFragment : MediaBrowserFragment<BrowserModel>(), IRefr
     }
 
     fun backTo(tag: String) {
-        requireActivity().supportFragmentManager.popBackStack(tag, FragmentManager.POP_BACK_STACK_INCLUSIVE)
+        requireActivity().supportFragmentManager.popBackStack(tag, androidx.fragment.app.FragmentManager.POP_BACK_STACK_INCLUSIVE)
     }
 
 
@@ -457,7 +457,7 @@ abstract class BaseBrowserFragment : MediaBrowserFragment<BrowserModel>(), IRefr
         }
     }
 
-    override fun onUpdateFinished(adapter: RecyclerView.Adapter<*>) {
+    override fun onUpdateFinished(adapter: androidx.recyclerview.widget.RecyclerView.Adapter<*>) {
         if (mSwipeRefreshLayout != null) mSwipeRefreshLayout.isRefreshing = false
         handler.sendEmptyMessage(MSG_HIDE_LOADING)
         updateEmptyView()
diff --git a/vlc-android/src/org/videolan/vlc/gui/browser/ExtensionAdapter.java b/vlc-android/src/org/videolan/vlc/gui/browser/ExtensionAdapter.java
index 6b668387b..7090157a6 100644
--- a/vlc-android/src/org/videolan/vlc/gui/browser/ExtensionAdapter.java
+++ b/vlc-android/src/org/videolan/vlc/gui/browser/ExtensionAdapter.java
@@ -1,8 +1,8 @@
 package org.videolan.vlc.gui.browser;
 
-import android.databinding.DataBindingUtil;
+import androidx.databinding.DataBindingUtil;
 import android.net.Uri;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/vlc-android/src/org/videolan/vlc/gui/browser/ExtensionBrowser.java b/vlc-android/src/org/videolan/vlc/gui/browser/ExtensionBrowser.java
index 78cd22266..a6fb69f9e 100644
--- a/vlc-android/src/org/videolan/vlc/gui/browser/ExtensionBrowser.java
+++ b/vlc-android/src/org/videolan/vlc/gui/browser/ExtensionBrowser.java
@@ -4,12 +4,12 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -31,7 +31,7 @@ import org.videolan.vlc.util.WeakHandler;
 import java.util.ArrayList;
 import java.util.List;
 
-public class ExtensionBrowser extends Fragment implements View.OnClickListener, android.support.v4.widget.SwipeRefreshLayout.OnRefreshListener, CtxActionReceiver {
+public class ExtensionBrowser extends Fragment implements View.OnClickListener, androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener, CtxActionReceiver {
 
     public static final String TAG = "VLC/ExtensionBrowser";
 
diff --git a/vlc-android/src/org/videolan/vlc/gui/browser/FileBrowserFragment.java b/vlc-android/src/org/videolan/vlc/gui/browser/FileBrowserFragment.java
index fa621c803..13d2161fd 100644
--- a/vlc-android/src/org/videolan/vlc/gui/browser/FileBrowserFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/browser/FileBrowserFragment.java
@@ -23,13 +23,13 @@
 
 package org.videolan.vlc.gui.browser;
 
-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuInflater;
diff --git a/vlc-android/src/org/videolan/vlc/gui/browser/FilePickerActivity.java b/vlc-android/src/org/videolan/vlc/gui/browser/FilePickerActivity.java
index 7f0180995..72be7bb1d 100644
--- a/vlc-android/src/org/videolan/vlc/gui/browser/FilePickerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/browser/FilePickerActivity.java
@@ -24,8 +24,8 @@
 package org.videolan.vlc.gui.browser;
 
 import android.os.Bundle;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AppCompatActivity;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 
 import org.videolan.vlc.R;
diff --git a/vlc-android/src/org/videolan/vlc/gui/browser/FilePickerFragment.kt b/vlc-android/src/org/videolan/vlc/gui/browser/FilePickerFragment.kt
index 4c7de8f5f..733a0285b 100644
--- a/vlc-android/src/org/videolan/vlc/gui/browser/FilePickerFragment.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/browser/FilePickerFragment.kt
@@ -24,11 +24,11 @@
 package org.videolan.vlc.gui.browser
 
 import android.app.Activity
-import android.arch.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProviders
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import android.text.TextUtils
 import android.view.View
 import kotlinx.coroutines.experimental.Dispatchers
@@ -51,7 +51,7 @@ class FilePickerFragment : FileBrowserFragment() {
         get() = false
 
 
-    override fun createFragment(): Fragment {
+    override fun createFragment(): androidx.fragment.app.Fragment {
         return FilePickerFragment()
     }
 
diff --git a/vlc-android/src/org/videolan/vlc/gui/browser/MediaBrowserFragment.java b/vlc-android/src/org/videolan/vlc/gui/browser/MediaBrowserFragment.java
index c6f7821a4..696387130 100644
--- a/vlc-android/src/org/videolan/vlc/gui/browser/MediaBrowserFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/browser/MediaBrowserFragment.java
@@ -27,16 +27,16 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.constraint.ConstraintLayout;
-import android.support.constraint.ConstraintSet;
-import android.support.design.widget.FloatingActionButton;
-import android.support.transition.TransitionManager;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.view.ActionMode;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.constraintlayout.widget.ConstraintSet;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.transition.TransitionManager;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.view.ActionMode;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -66,7 +66,7 @@ import org.videolan.vlc.viewmodels.SortableModel;
 
 import java.util.LinkedList;
 
-public abstract class MediaBrowserFragment<T extends SortableModel> extends Fragment implements android.support.v7.view.ActionMode.Callback, Filterable {
+public abstract class MediaBrowserFragment<T extends SortableModel> extends Fragment implements androidx.appcompat.view.ActionMode.Callback, Filterable {
 
     public final static String TAG = "VLC/MediaBrowserFragment";
 
diff --git a/vlc-android/src/org/videolan/vlc/gui/browser/NetworkBrowserFragment.java b/vlc-android/src/org/videolan/vlc/gui/browser/NetworkBrowserFragment.java
index f77758c2b..0a025b655 100644
--- a/vlc-android/src/org/videolan/vlc/gui/browser/NetworkBrowserFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/browser/NetworkBrowserFragment.java
@@ -23,18 +23,18 @@
 
 package org.videolan.vlc.gui.browser;
 
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
diff --git a/vlc-android/src/org/videolan/vlc/gui/browser/PathAdapter.kt b/vlc-android/src/org/videolan/vlc/gui/browser/PathAdapter.kt
index 5d524d3c7..0d324e687 100644
--- a/vlc-android/src/org/videolan/vlc/gui/browser/PathAdapter.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/browser/PathAdapter.kt
@@ -1,8 +1,8 @@
 package org.videolan.vlc.gui.browser
 
 import android.net.Uri
-import android.support.v4.util.SimpleArrayMap
-import android.support.v7.widget.RecyclerView
+import androidx.collection.SimpleArrayMap
+import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.TextView
@@ -11,9 +11,9 @@ import org.videolan.medialibrary.media.MediaWrapper
 import org.videolan.vlc.R
 import org.videolan.vlc.util.AndroidDevices
 
-private val storages = SimpleArrayMap<String, String>()
+private val storages = androidx.collection.SimpleArrayMap<String, String>()
 
-class PathAdapter(val browser: BaseBrowserFragment, media: MediaWrapper) : RecyclerView.Adapter<PathAdapter.ViewHolder>() {
+class PathAdapter(val browser: BaseBrowserFragment, media: MediaWrapper) : androidx.recyclerview.widget.RecyclerView.Adapter<PathAdapter.ViewHolder>() {
 
     init {
         if (media.hasStateFlags(MediaLibraryItem.FLAG_STORAGE)) storages.put(Uri.decode(media.uri.path), media.title)
@@ -34,7 +34,7 @@ class PathAdapter(val browser: BaseBrowserFragment, media: MediaWrapper) : Recyc
         holder.root.text = segments[position]
     }
 
-    inner class ViewHolder(val root : TextView) : RecyclerView.ViewHolder(root) {
+    inner class ViewHolder(val root : TextView) : androidx.recyclerview.widget.RecyclerView.ViewHolder(root) {
         init {
             root.setOnClickListener {
                 browser.backTo(adapterPosition.let { when (it) {
diff --git a/vlc-android/src/org/videolan/vlc/gui/browser/StorageBrowserFragment.kt b/vlc-android/src/org/videolan/vlc/gui/browser/StorageBrowserFragment.kt
index bacfdc8ce..7439dd5e3 100644
--- a/vlc-android/src/org/videolan/vlc/gui/browser/StorageBrowserFragment.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/browser/StorageBrowserFragment.kt
@@ -24,16 +24,16 @@
 package org.videolan.vlc.gui.browser
 
 import android.annotation.TargetApi
-import android.arch.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProviders
 import android.content.DialogInterface
-import android.databinding.DataBindingUtil
+import androidx.databinding.DataBindingUtil
 import android.os.Build
 import android.os.Bundle
-import android.support.design.widget.Snackbar
-import android.support.v4.app.Fragment
-import android.support.v4.util.SimpleArrayMap
-import android.support.v7.app.AlertDialog
-import android.support.v7.widget.AppCompatEditText
+import com.google.android.material.snackbar.Snackbar
+import androidx.fragment.app.Fragment
+import androidx.collection.SimpleArrayMap
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.widget.AppCompatEditText
 import android.text.InputType
 import android.view.Menu
 import android.view.MenuItem
@@ -67,14 +67,14 @@ const val KEY_IN_MEDIALIB = "key_in_medialib"
 class StorageBrowserFragment : FileBrowserFragment(), EntryPointsEventsCb {
 
     internal var mScannedDirectory = false
-    private val mProcessingFolders = SimpleArrayMap<String, CheckBox>()
-    private var mSnack: Snackbar? = null
+    private val mProcessingFolders = androidx.collection.SimpleArrayMap<String, CheckBox>()
+    private var mSnack: com.google.android.material.snackbar.Snackbar? = null
     private var mAlertDialog: AlertDialog? = null
 
     override val categoryTitle: String
         get() = getString(R.string.directories_summary)
 
-    override fun createFragment(): Fragment {
+    override fun createFragment(): androidx.fragment.app.Fragment {
         return StorageBrowserFragment()
     }
 
@@ -90,7 +90,7 @@ class StorageBrowserFragment : FileBrowserFragment(), EntryPointsEventsCb {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         if (isRootDirectory && AndroidDevices.showTvUi(view.context)) {
-            mSnack = Snackbar.make(view, R.string.tv_settings_hint, Snackbar.LENGTH_INDEFINITE)
+            mSnack = com.google.android.material.snackbar.Snackbar.make(view, R.string.tv_settings_hint, com.google.android.material.snackbar.Snackbar.LENGTH_INDEFINITE)
             if (AndroidUtil.isLolliPopOrLater) mSnack?.view?.elevation = view.resources.getDimensionPixelSize(R.dimen.audio_player_elevation).toFloat()
         }
     }
diff --git a/vlc-android/src/org/videolan/vlc/gui/dialogs/AdvOptionsDialog.java b/vlc-android/src/org/videolan/vlc/gui/dialogs/AdvOptionsDialog.java
index df2cb4b9c..bdfd6aa28 100644
--- a/vlc-android/src/org/videolan/vlc/gui/dialogs/AdvOptionsDialog.java
+++ b/vlc-android/src/org/videolan/vlc/gui/dialogs/AdvOptionsDialog.java
@@ -27,7 +27,7 @@ import android.app.Activity;
 import android.app.AlarmManager;
 import android.app.Dialog;
 import android.app.PendingIntent;
-import android.arch.lifecycle.Observer;
+import androidx.lifecycle.Observer;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -36,10 +36,10 @@ import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.format.DateFormat;
 import android.view.Gravity;
 import android.view.KeyEvent;
diff --git a/vlc-android/src/org/videolan/vlc/gui/dialogs/ContextSheet.kt b/vlc-android/src/org/videolan/vlc/gui/dialogs/ContextSheet.kt
index 2c53cb419..508e41c74 100644
--- a/vlc-android/src/org/videolan/vlc/gui/dialogs/ContextSheet.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/dialogs/ContextSheet.kt
@@ -21,10 +21,10 @@
 package org.videolan.vlc.gui.dialogs
 
 import android.os.Bundle
-import android.support.design.widget.BottomSheetDialogFragment
-import android.support.v4.app.FragmentActivity
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import androidx.fragment.app.FragmentActivity
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -39,7 +39,7 @@ const val CTX_TITLE_KEY = "CTX_TITLE_KEY"
 const val CTX_POSITION_KEY = "CTX_POSITION_KEY"
 const val CTX_FLAGS_KEY = "CTX_FLAGS_KEY"
 
-class ContextSheet : BottomSheetDialogFragment() {
+class ContextSheet : com.google.android.material.bottomsheet.BottomSheetDialogFragment() {
 
     private lateinit var options : List<CtxOption>
     lateinit var receiver : CtxActionReceiver
@@ -70,8 +70,8 @@ class ContextSheet : BottomSheetDialogFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         view.findViewById<TextView>(R.id.ctx_title).text = arguments?.getString(CTX_TITLE_KEY) ?: ""
-        val list = view.findViewById<RecyclerView>(R.id.ctx_list)
-        list.layoutManager = LinearLayoutManager(requireContext())
+        val list = view.findViewById<androidx.recyclerview.widget.RecyclerView>(R.id.ctx_list)
+        list.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(requireContext())
         list.adapter = ContextAdapter()
         val flags = arguments?.getInt(CTX_FLAGS_KEY) ?: 0
         options = populateOptions(flags)
@@ -99,11 +99,11 @@ class ContextSheet : BottomSheetDialogFragment() {
         if (flags and CTX_RENAME != 0) add(Simple(CTX_RENAME, getString(R.string.rename), R.drawable.ic_ctx_edit_normal))
     }
 
-    inner class ContextAdapter : RecyclerView.Adapter<ContextAdapter.ViewHolder>() {
+    inner class ContextAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<ContextAdapter.ViewHolder>() {
 
         private val inflater: LayoutInflater by lazy(LazyThreadSafetyMode.NONE) { LayoutInflater.from(requireContext()) }
 
-        inner class ViewHolder(val binding : ContextItemBinding) : RecyclerView.ViewHolder(binding.root) {
+        inner class ViewHolder(val binding : ContextItemBinding) : androidx.recyclerview.widget.RecyclerView.ViewHolder(binding.root) {
             init {
                 itemView.setOnClickListener {
                     receiver.onCtxAction(itemPosition, options[layoutPosition].id)
@@ -130,7 +130,7 @@ interface CtxActionReceiver {
     fun onCtxAction(position: Int, option: Int)
 }
 
-fun showContext(activity: FragmentActivity, receiver: CtxActionReceiver, position: Int, title: String, flags: Int) {
+fun showContext(activity: androidx.fragment.app.FragmentActivity, receiver: CtxActionReceiver, position: Int, title: String, flags: Int) {
     val ctxDialog = ContextSheet()
     ctxDialog.arguments = Bundle(3).apply {
         putString(CTX_TITLE_KEY, title)
diff --git a/vlc-android/src/org/videolan/vlc/gui/dialogs/DismissDialogFragment.java b/vlc-android/src/org/videolan/vlc/gui/dialogs/DismissDialogFragment.java
index 175663c2e..e5794c565 100644
--- a/vlc-android/src/org/videolan/vlc/gui/dialogs/DismissDialogFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/dialogs/DismissDialogFragment.java
@@ -1,7 +1,7 @@
 package org.videolan.vlc.gui.dialogs;
 
 import android.content.DialogInterface;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 
 public class DismissDialogFragment extends DialogFragment {
     protected DialogInterface.OnDismissListener onDismissListener;
diff --git a/vlc-android/src/org/videolan/vlc/gui/dialogs/DownloaderDialogFragment.java b/vlc-android/src/org/videolan/vlc/gui/dialogs/DownloaderDialogFragment.java
index f6232a09e..844298a75 100644
--- a/vlc-android/src/org/videolan/vlc/gui/dialogs/DownloaderDialogFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/dialogs/DownloaderDialogFragment.java
@@ -4,10 +4,10 @@ import android.app.Dialog;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AppCompatDialog;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.appcompat.app.AppCompatDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/vlc-android/src/org/videolan/vlc/gui/dialogs/NetworkServerDialog.java b/vlc-android/src/org/videolan/vlc/gui/dialogs/NetworkServerDialog.java
index 204f516da..9d8425ef4 100644
--- a/vlc-android/src/org/videolan/vlc/gui/dialogs/NetworkServerDialog.java
+++ b/vlc-android/src/org/videolan/vlc/gui/dialogs/NetworkServerDialog.java
@@ -5,11 +5,11 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.TextInputLayout;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v7.app.AppCompatDialog;
+import androidx.annotation.NonNull;
+import com.google.android.material.textfield.TextInputLayout;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.appcompat.app.AppCompatDialog;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
diff --git a/vlc-android/src/org/videolan/vlc/gui/dialogs/PickTimeFragment.java b/vlc-android/src/org/videolan/vlc/gui/dialogs/PickTimeFragment.java
index 286df07ad..6b8277d29 100644
--- a/vlc-android/src/org/videolan/vlc/gui/dialogs/PickTimeFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/dialogs/PickTimeFragment.java
@@ -23,8 +23,8 @@
 package org.videolan.vlc.gui.dialogs;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/vlc-android/src/org/videolan/vlc/gui/dialogs/PlaybackSpeedDialog.java b/vlc-android/src/org/videolan/vlc/gui/dialogs/PlaybackSpeedDialog.java
index d26cec852..4f774944c 100644
--- a/vlc-android/src/org/videolan/vlc/gui/dialogs/PlaybackSpeedDialog.java
+++ b/vlc-android/src/org/videolan/vlc/gui/dialogs/PlaybackSpeedDialog.java
@@ -22,8 +22,8 @@
 package org.videolan.vlc.gui.dialogs;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/vlc-android/src/org/videolan/vlc/gui/dialogs/RenderersDialog.kt b/vlc-android/src/org/videolan/vlc/gui/dialogs/RenderersDialog.kt
index 25d5d86bb..cb22bcc10 100644
--- a/vlc-android/src/org/videolan/vlc/gui/dialogs/RenderersDialog.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/dialogs/RenderersDialog.kt
@@ -20,11 +20,11 @@
 package org.videolan.vlc.gui.dialogs
 
 import android.app.Dialog
-import android.arch.lifecycle.Observer
+import androidx.lifecycle.Observer
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
-import android.support.v4.content.ContextCompat
-import android.support.v7.widget.LinearLayoutManager
+import androidx.fragment.app.DialogFragment
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.LinearLayoutManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -42,7 +42,7 @@ import org.videolan.vlc.gui.helpers.UiTools
 
 const private val TAG = "VLC/RenderersDialog"
 
-class RenderersDialog : DialogFragment(), PlaybackService.Client.Callback {
+class RenderersDialog : androidx.fragment.app.DialogFragment(), PlaybackService.Client.Callback {
     private var renderers = RendererDelegate.renderers.value
     private lateinit var mBinding: DialogRenderersBinding
     private val mAdapter = RendererAdapter()
@@ -71,14 +71,14 @@ class RenderersDialog : DialogFragment(), PlaybackService.Client.Callback {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        setStyle(DialogFragment.STYLE_NO_FRAME, 0)
+        setStyle(androidx.fragment.app.DialogFragment.STYLE_NO_FRAME, 0)
         mBinding = DialogRenderersBinding.inflate(inflater, container, false)
         return mBinding.root
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         mBinding.holder = mClickHandler;
-        mBinding.renderersList.layoutManager = LinearLayoutManager(view.context)
+        mBinding.renderersList.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(view.context)
         mBinding.renderersList.adapter = mAdapter
         mBinding.renderersDisconnect.isEnabled = RendererDelegate.hasRenderer()
         mBinding.renderersDisconnect.setTextColor(ContextCompat.getColor(view.context, if (RendererDelegate.hasRenderer()) R.color.orange800 else R.color.grey400))
diff --git a/vlc-android/src/org/videolan/vlc/gui/dialogs/SavePlaylistDialog.java b/vlc-android/src/org/videolan/vlc/gui/dialogs/SavePlaylistDialog.java
index 5af12487a..2bc989315 100644
--- a/vlc-android/src/org/videolan/vlc/gui/dialogs/SavePlaylistDialog.java
+++ b/vlc-android/src/org/videolan/vlc/gui/dialogs/SavePlaylistDialog.java
@@ -25,13 +25,13 @@ package org.videolan.vlc.gui.dialogs;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TextInputLayout;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AppCompatDialog;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.textfield.TextInputLayout;
+import androidx.fragment.app.DialogFragment;
+import androidx.appcompat.app.AppCompatDialog;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/vlc-android/src/org/videolan/vlc/gui/dialogs/SelectChapterDialog.java b/vlc-android/src/org/videolan/vlc/gui/dialogs/SelectChapterDialog.java
index 5912db306..97a4cc9fc 100644
--- a/vlc-android/src/org/videolan/vlc/gui/dialogs/SelectChapterDialog.java
+++ b/vlc-android/src/org/videolan/vlc/gui/dialogs/SelectChapterDialog.java
@@ -22,8 +22,8 @@
 package org.videolan.vlc.gui.dialogs;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/vlc-android/src/org/videolan/vlc/gui/dialogs/SubtitleDownloadFragment.kt b/vlc-android/src/org/videolan/vlc/gui/dialogs/SubtitleDownloadFragment.kt
index 2cfcad0ed..aff66ab38 100644
--- a/vlc-android/src/org/videolan/vlc/gui/dialogs/SubtitleDownloadFragment.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/dialogs/SubtitleDownloadFragment.kt
@@ -1,11 +1,11 @@
 package org.videolan.vlc.gui.dialogs
 
-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProviders
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v7.widget.DividerItemDecoration
-import android.support.v7.widget.LinearLayoutManager
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -20,7 +20,7 @@ import org.videolan.vlc.util.AndroidDevices
 import org.videolan.vlc.util.VLCDownloadManager
 import org.videolan.vlc.viewmodels.SubtitlesModel
 
-class SubtitleDownloadFragment : Fragment() {
+class SubtitleDownloadFragment : androidx.fragment.app.Fragment() {
     private lateinit var viewModel: SubtitlesModel
     private lateinit var adapter: SubtitlesAdapter
     lateinit var mediaPath: String
@@ -53,9 +53,9 @@ class SubtitleDownloadFragment : Fragment() {
 
         adapter = SubtitlesAdapter(listEventActor)
         val recyclerView = binding.subtitleList
-        recyclerView.addItemDecoration(DividerItemDecoration(activity, DividerItemDecoration.VERTICAL))
+        recyclerView.addItemDecoration(androidx.recyclerview.widget.DividerItemDecoration(activity, androidx.recyclerview.widget.DividerItemDecoration.VERTICAL))
         recyclerView.adapter = adapter
-        recyclerView.layoutManager = LinearLayoutManager(activity)
+        recyclerView.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(activity)
         viewModel.result.observe(this, Observer {
             adapter.setList(it)
         })
diff --git a/vlc-android/src/org/videolan/vlc/gui/dialogs/SubtitleDownloaderDialogFragment.kt b/vlc-android/src/org/videolan/vlc/gui/dialogs/SubtitleDownloaderDialogFragment.kt
index 72733b1b0..17cf2b886 100644
--- a/vlc-android/src/org/videolan/vlc/gui/dialogs/SubtitleDownloaderDialogFragment.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/dialogs/SubtitleDownloaderDialogFragment.kt
@@ -3,9 +3,9 @@ package org.videolan.vlc.gui.dialogs
 import android.content.Context
 import android.net.Uri
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
-import android.support.v4.app.FragmentManager
-import android.support.v4.app.FragmentPagerAdapter
+import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentPagerAdapter
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -16,7 +16,7 @@ import org.videolan.vlc.media.MediaUtils
 private const val MEDIA_PATHS = "MEDIA_PATHS"
 const val MEDIA_PATH = "MEDIA_PATH"
 
-class SubtitleDownloaderDialogFragment: DialogFragment() {
+class SubtitleDownloaderDialogFragment: androidx.fragment.app.DialogFragment() {
     private lateinit var adapter: ViewPagerAdapter
     lateinit var paths: List<String>
 
@@ -62,7 +62,7 @@ class SubtitleDownloaderDialogFragment: DialogFragment() {
         }
     }
 
-    class ViewPagerAdapter(context: Context, fragmentManager: FragmentManager, private val paths: List<String>): FragmentPagerAdapter(fragmentManager) {
+    class ViewPagerAdapter(context: Context, fragmentManager: androidx.fragment.app.FragmentManager, private val paths: List<String>): androidx.fragment.app.FragmentPagerAdapter(fragmentManager) {
         private val tabTitles = arrayOf(context.getString(R.string.download), context.getString(R.string.history))
 
         override fun getPageTitle(position: Int): String? = tabTitles[position]
diff --git a/vlc-android/src/org/videolan/vlc/gui/dialogs/SubtitleHistoryFragment.kt b/vlc-android/src/org/videolan/vlc/gui/dialogs/SubtitleHistoryFragment.kt
index cc1f04a48..bd35168c8 100644
--- a/vlc-android/src/org/videolan/vlc/gui/dialogs/SubtitleHistoryFragment.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/dialogs/SubtitleHistoryFragment.kt
@@ -1,12 +1,12 @@
 package org.videolan.vlc.gui.dialogs
 
 
-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProviders
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v7.widget.DividerItemDecoration
-import android.support.v7.widget.LinearLayoutManager
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -16,7 +16,7 @@ import org.videolan.vlc.databinding.SubtitleHistoryFragmentBinding
 import org.videolan.vlc.gui.helpers.UiTools.deleteSubtitleDialog
 import org.videolan.vlc.viewmodels.SubtitlesModel
 
-class SubtitleHistoryFragment : Fragment() {
+class SubtitleHistoryFragment : androidx.fragment.app.Fragment() {
     private lateinit var viewModel: SubtitlesModel
     private lateinit var adapter: SubtitlesAdapter
     lateinit var mediaPath: String
@@ -42,9 +42,9 @@ class SubtitleHistoryFragment : Fragment() {
 
         adapter = SubtitlesAdapter(listEventActor)
         val recyclerView = binding.subtitleList
-        recyclerView.addItemDecoration(DividerItemDecoration(activity, DividerItemDecoration.VERTICAL))
+        recyclerView.addItemDecoration(androidx.recyclerview.widget.DividerItemDecoration(activity, androidx.recyclerview.widget.DividerItemDecoration.VERTICAL))
         recyclerView.adapter = adapter
-        recyclerView.layoutManager = LinearLayoutManager(activity)
+        recyclerView.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(activity)
         viewModel.history.observe(this, Observer {
             adapter.setList(it)
         })
diff --git a/vlc-android/src/org/videolan/vlc/gui/dialogs/SubtitlesAdapter.kt b/vlc-android/src/org/videolan/vlc/gui/dialogs/SubtitlesAdapter.kt
index fcb6cef47..6132e72e0 100644
--- a/vlc-android/src/org/videolan/vlc/gui/dialogs/SubtitlesAdapter.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/dialogs/SubtitlesAdapter.kt
@@ -1,6 +1,6 @@
 package org.videolan.vlc.gui.dialogs
 
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -8,7 +8,7 @@ import kotlinx.coroutines.experimental.channels.SendChannel
 import org.videolan.vlc.api.OpenSubtitle
 import org.videolan.vlc.databinding.SubtitleDownloadItemBinding
 
-internal class SubtitlesAdapter(private val eventActor: SendChannel<SubtitleItem>) : RecyclerView.Adapter<SubtitlesAdapter.ViewHolder>() {
+internal class SubtitlesAdapter(private val eventActor: SendChannel<SubtitleItem>) : androidx.recyclerview.widget.RecyclerView.Adapter<SubtitlesAdapter.ViewHolder>() {
     private var dataset: List<SubtitleItem>? = null
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SubtitlesAdapter.ViewHolder {
@@ -29,7 +29,7 @@ internal class SubtitlesAdapter(private val eventActor: SendChannel<SubtitleItem
 
     override fun getItemCount() = dataset?.size ?: 0
 
-    inner class ViewHolder(val binding: SubtitleDownloadItemBinding) : RecyclerView.ViewHolder(binding.root), View.OnClickListener {
+    inner class ViewHolder(val binding: SubtitleDownloadItemBinding) : androidx.recyclerview.widget.RecyclerView.ViewHolder(binding.root), View.OnClickListener {
 
         init {
             itemView.setOnClickListener(this)
diff --git a/vlc-android/src/org/videolan/vlc/gui/dialogs/VlcDialog.java b/vlc-android/src/org/videolan/vlc/gui/dialogs/VlcDialog.java
index 43668558e..0a88633e9 100644
--- a/vlc-android/src/org/videolan/vlc/gui/dialogs/VlcDialog.java
+++ b/vlc-android/src/org/videolan/vlc/gui/dialogs/VlcDialog.java
@@ -22,12 +22,12 @@
 
 package org.videolan.vlc.gui.dialogs;
 
-import android.databinding.DataBindingUtil;
+import androidx.databinding.DataBindingUtil;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AppCompatDialog;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.appcompat.app.AppCompatDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -36,7 +36,7 @@ import org.videolan.libvlc.Dialog;
 import org.videolan.vlc.BR;
 import org.videolan.vlc.VLCApplication;
 
-public abstract class VlcDialog<T extends Dialog, B extends android.databinding.ViewDataBinding> extends DialogFragment {
+public abstract class VlcDialog<T extends Dialog, B extends androidx.databinding.ViewDataBinding> extends DialogFragment {
 
     T mVlcDialog;
     B mBinding;
diff --git a/vlc-android/src/org/videolan/vlc/gui/dialogs/VlcLoginDialog.java b/vlc-android/src/org/videolan/vlc/gui/dialogs/VlcLoginDialog.java
index 53a76cc21..977506751 100644
--- a/vlc-android/src/org/videolan/vlc/gui/dialogs/VlcLoginDialog.java
+++ b/vlc-android/src/org/videolan/vlc/gui/dialogs/VlcLoginDialog.java
@@ -28,8 +28,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.annotation.Nullable;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.view.View;
 import android.widget.EditText;
 
diff --git a/vlc-android/src/org/videolan/vlc/gui/helpers/AudioUtil.java b/vlc-android/src/org/videolan/vlc/gui/helpers/AudioUtil.java
index 1cbbc3df3..b461df0bf 100644
--- a/vlc-android/src/org/videolan/vlc/gui/helpers/AudioUtil.java
+++ b/vlc-android/src/org/videolan/vlc/gui/helpers/AudioUtil.java
@@ -30,8 +30,8 @@ import android.graphics.BitmapFactory;
 import android.media.RingtoneManager;
 import android.net.Uri;
 import android.provider.MediaStore;
-import android.support.annotation.WorkerThread;
-import android.support.v4.app.FragmentActivity;
+import androidx.annotation.WorkerThread;
+import androidx.fragment.app.FragmentActivity;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
diff --git a/vlc-android/src/org/videolan/vlc/gui/helpers/BitmapCache.java b/vlc-android/src/org/videolan/vlc/gui/helpers/BitmapCache.java
index 0e3bd38d8..66f8b27cc 100644
--- a/vlc-android/src/org/videolan/vlc/gui/helpers/BitmapCache.java
+++ b/vlc-android/src/org/videolan/vlc/gui/helpers/BitmapCache.java
@@ -25,7 +25,7 @@ import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Build;
-import android.support.v4.util.LruCache;
+import androidx.collection.LruCache;
 import android.util.Log;
 
 import org.videolan.vlc.BuildConfig;
diff --git a/vlc-android/src/org/videolan/vlc/gui/helpers/BottomSheetBehavior.java b/vlc-android/src/org/videolan/vlc/gui/helpers/BottomSheetBehavior.java
index 28ef74c41..7b80eff04 100644
--- a/vlc-android/src/org/videolan/vlc/gui/helpers/BottomSheetBehavior.java
+++ b/vlc-android/src/org/videolan/vlc/gui/helpers/BottomSheetBehavior.java
@@ -1,13 +1,13 @@
 package org.videolan.vlc.gui.helpers;
 
 import android.content.Context;
-import android.support.design.widget.CoordinatorLayout;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 
 
-public class BottomSheetBehavior<V extends View> extends android.support.design.widget.BottomSheetBehavior<V> {
+public class BottomSheetBehavior<V extends View> extends com.google.android.material.bottomsheet.BottomSheetBehavior<V> {
     public static final String TAG = "VLC/BottomSheetBehavior";
     private boolean lock = false;
 
diff --git a/vlc-android/src/org/videolan/vlc/gui/helpers/FloatingActionButtonBehavior.java b/vlc-android/src/org/videolan/vlc/gui/helpers/FloatingActionButtonBehavior.java
index d2cd080da..19007e040 100644
--- a/vlc-android/src/org/videolan/vlc/gui/helpers/FloatingActionButtonBehavior.java
+++ b/vlc-android/src/org/videolan/vlc/gui/helpers/FloatingActionButtonBehavior.java
@@ -25,12 +25,12 @@
 package org.videolan.vlc.gui.helpers;
 
 import android.content.Context;
-import android.support.annotation.Keep;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.support.v4.view.ViewCompat;
+import androidx.annotation.Keep;
+import com.google.android.material.appbar.AppBarLayout;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.core.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.View;
 
diff --git a/vlc-android/src/org/videolan/vlc/gui/helpers/ImageLoader.kt b/vlc-android/src/org/videolan/vlc/gui/helpers/ImageLoader.kt
index 9a4d86b40..917860bb0 100644
--- a/vlc-android/src/org/videolan/vlc/gui/helpers/ImageLoader.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/helpers/ImageLoader.kt
@@ -1,15 +1,15 @@
 package org.videolan.vlc.gui.helpers
 
-import android.databinding.BindingAdapter
-import android.databinding.DataBindingUtil
-import android.databinding.OnRebindCallback
-import android.databinding.ViewDataBinding
+import androidx.databinding.BindingAdapter
+import androidx.databinding.DataBindingUtil
+import androidx.databinding.OnRebindCallback
+import androidx.databinding.ViewDataBinding
 import android.graphics.Bitmap
 import android.graphics.drawable.BitmapDrawable
 import android.net.Uri
-import android.support.annotation.MainThread
-import android.support.v17.leanback.widget.ImageCardView
-import android.support.v4.view.ViewCompat
+import androidx.annotation.MainThread
+import androidx.leanback.widget.ImageCardView
+import androidx.core.view.ViewCompat
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
diff --git a/vlc-android/src/org/videolan/vlc/gui/helpers/Navigator.kt b/vlc-android/src/org/videolan/vlc/gui/helpers/Navigator.kt
index dc1996001..2ab7a4ff5 100644
--- a/vlc-android/src/org/videolan/vlc/gui/helpers/Navigator.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/helpers/Navigator.kt
@@ -23,16 +23,16 @@
 
 package org.videolan.vlc.gui.helpers
 
-import android.arch.lifecycle.Lifecycle
-import android.arch.lifecycle.LifecycleObserver
-import android.arch.lifecycle.OnLifecycleEvent
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.OnLifecycleEvent
 import android.content.Intent
 import android.content.SharedPreferences
 import android.os.Bundle
-import android.support.design.widget.NavigationView
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentManager
-import android.support.v4.util.SimpleArrayMap
+import com.google.android.material.navigation.NavigationView
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.collection.SimpleArrayMap
 import android.util.Log
 import android.view.MenuItem
 import org.videolan.vlc.R
@@ -54,12 +54,12 @@ class Navigator(private val activity: MainActivity,
         private val settings: SharedPreferences,
         private val extensionsService: ExtensionManagerService?,
         state: Bundle?
-): NavigationView.OnNavigationItemSelectedListener, LifecycleObserver {
+): com.google.android.material.navigation.NavigationView.OnNavigationItemSelectedListener, LifecycleObserver {
 
-    private val fragmentsStack = SimpleArrayMap<String, WeakReference<Fragment>>()
+    private val fragmentsStack = androidx.collection.SimpleArrayMap<String, WeakReference<androidx.fragment.app.Fragment>>()
     private val defaultFragmentId inline get() = if (settings.getInt(KEY_MEDIALIBRARY_SCAN, ML_SCAN_OFF) == ML_SCAN_ON) R.id.nav_video else R.id.nav_directories
     var currentFragmentId = 0
-    var currentFragment: Fragment? = null
+    var currentFragment: androidx.fragment.app.Fragment? = null
         private set
 
     init {
@@ -74,7 +74,7 @@ class Navigator(private val activity: MainActivity,
         }
     }
 
-    private fun getNewFragment(id: Int): Fragment {
+    private fun getNewFragment(id: Int): androidx.fragment.app.Fragment {
         return when (id) {
             R.id.nav_audio -> AudioBrowserFragment()
             R.id.nav_directories -> FileBrowserFragment()
@@ -96,10 +96,10 @@ class Navigator(private val activity: MainActivity,
         showFragment(fragment, id, tag)
     }
 
-    private fun showFragment(fragment: Fragment, id: Int, tag: String = getTag(id), backTag: String? = null) {
+    private fun showFragment(fragment: androidx.fragment.app.Fragment, id: Int, tag: String = getTag(id), backTag: String? = null) {
         val fm = activity.supportFragmentManager
         if (currentFragment is BaseBrowserFragment && !(currentFragment as BaseBrowserFragment).isRootDirectory)
-            fm.popBackStackImmediate("root", FragmentManager.POP_BACK_STACK_INCLUSIVE)
+            fm.popBackStackImmediate("root", androidx.fragment.app.FragmentManager.POP_BACK_STACK_INCLUSIVE)
         val ft = fm.beginTransaction()
         ft.replace(R.id.fragment_placeholder, fragment, tag)
         if (backTag !== null) ft.addToBackStack(backTag)
@@ -109,7 +109,7 @@ class Navigator(private val activity: MainActivity,
         currentFragmentId = id
     }
 
-    private fun restoreFragmentsStack(fm: FragmentManager) {
+    private fun restoreFragmentsStack(fm: androidx.fragment.app.FragmentManager) {
         val fragments = fm.fragments
         if (fragments != null) {
             val ft = fm.beginTransaction()
@@ -188,7 +188,7 @@ class Navigator(private val activity: MainActivity,
             if (currentFragmentId == id) { /* Already selected */
                 // Go back at root level of current mProvider
                 if (current is BaseBrowserFragment && !current.isRootDirectory) {
-                    activity.supportFragmentManager.popBackStackImmediate(getTag(id), FragmentManager.POP_BACK_STACK_INCLUSIVE)
+                    activity.supportFragmentManager.popBackStackImmediate(getTag(id), androidx.fragment.app.FragmentManager.POP_BACK_STACK_INCLUSIVE)
                 } else {
                     activity.closeDrawer()
                     return false
diff --git a/vlc-android/src/org/videolan/vlc/gui/helpers/NotificationHelper.java b/vlc-android/src/org/videolan/vlc/gui/helpers/NotificationHelper.java
index 189af7a7a..a76c0f9e0 100644
--- a/vlc-android/src/org/videolan/vlc/gui/helpers/NotificationHelper.java
+++ b/vlc-android/src/org/videolan/vlc/gui/helpers/NotificationHelper.java
@@ -28,9 +28,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.media.session.MediaButtonReceiver;
+import androidx.annotation.RequiresApi;
+import androidx.core.app.NotificationCompat;
+import androidx.media.session.MediaButtonReceiver;
 import android.support.v4.media.session.MediaSessionCompat;
 import android.support.v4.media.session.PlaybackStateCompat;
 
@@ -87,7 +87,7 @@ public class NotificationHelper {
                 R.drawable.ic_widget_close_w, ctx.getString(R.string.stop), piStop));
 
         if (AndroidDevices.showMediaStyle) {
-            builder.setStyle(new android.support.v4.media.app.NotificationCompat.MediaStyle()
+            builder.setStyle(new androidx.media.app.NotificationCompat.MediaStyle()
                     .setMediaSession(sessionToken)
                     .setShowActionsInCompactView(0,1,2)
                     .setShowCancelButton(true)
@@ -97,7 +97,7 @@ public class NotificationHelper {
         return builder.build();
     }
 
-    private static android.support.v4.app.NotificationCompat.Builder scanCompatBuilder;
+    private static androidx.core.app.NotificationCompat.Builder scanCompatBuilder;
     private static final Intent notificationIntent = new Intent();
     public static Notification createScanNotification(Context ctx, String progressText, boolean updateActions, boolean paused) {
         if (scanCompatBuilder == null) {
diff --git a/vlc-android/src/org/videolan/vlc/gui/helpers/SelectorViewHolder.java b/vlc-android/src/org/videolan/vlc/gui/helpers/SelectorViewHolder.java
index 4384bf72b..fa119ff3d 100644
--- a/vlc-android/src/org/videolan/vlc/gui/helpers/SelectorViewHolder.java
+++ b/vlc-android/src/org/videolan/vlc/gui/helpers/SelectorViewHolder.java
@@ -22,8 +22,8 @@
  */
 package org.videolan.vlc.gui.helpers;
 
-import android.databinding.ViewDataBinding;
-import android.support.v7.widget.RecyclerView;
+import androidx.databinding.ViewDataBinding;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 import org.videolan.vlc.BR;
diff --git a/vlc-android/src/org/videolan/vlc/gui/helpers/SwipeDragItemTouchHelperCallback.java b/vlc-android/src/org/videolan/vlc/gui/helpers/SwipeDragItemTouchHelperCallback.java
index a284dcc3a..009f71460 100644
--- a/vlc-android/src/org/videolan/vlc/gui/helpers/SwipeDragItemTouchHelperCallback.java
+++ b/vlc-android/src/org/videolan/vlc/gui/helpers/SwipeDragItemTouchHelperCallback.java
@@ -23,8 +23,8 @@
 
 package org.videolan.vlc.gui.helpers;
 
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.helper.ItemTouchHelper;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.ItemTouchHelper;
 
 import org.videolan.vlc.interfaces.SwipeDragHelperAdapter;
 
diff --git a/vlc-android/src/org/videolan/vlc/gui/helpers/ThreeStatesCheckbox.java b/vlc-android/src/org/videolan/vlc/gui/helpers/ThreeStatesCheckbox.java
index 1e4eab740..47b7397e1 100644
--- a/vlc-android/src/org/videolan/vlc/gui/helpers/ThreeStatesCheckbox.java
+++ b/vlc-android/src/org/videolan/vlc/gui/helpers/ThreeStatesCheckbox.java
@@ -24,7 +24,7 @@
 package org.videolan.vlc.gui.helpers;
 
 import android.content.Context;
-import android.support.v7.widget.AppCompatCheckBox;
+import androidx.appcompat.widget.AppCompatCheckBox;
 import android.util.AttributeSet;
 import android.widget.CompoundButton;
 
diff --git a/vlc-android/src/org/videolan/vlc/gui/helpers/UiTools.java b/vlc-android/src/org/videolan/vlc/gui/helpers/UiTools.java
index 111b395b3..ece22e776 100644
--- a/vlc-android/src/org/videolan/vlc/gui/helpers/UiTools.java
+++ b/vlc-android/src/org/videolan/vlc/gui/helpers/UiTools.java
@@ -32,7 +32,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.content.res.TypedArray;
-import android.databinding.BindingAdapter;
+import androidx.databinding.BindingAdapter;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
@@ -45,14 +45,14 @@ import android.renderscript.Allocation;
 import android.renderscript.Element;
 import android.renderscript.RenderScript;
 import android.renderscript.ScriptIntrinsicBlur;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.fragment.app.FragmentActivity;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.Html;
 import android.text.TextUtils;
 import android.view.DragAndDropPermissions;
diff --git a/vlc-android/src/org/videolan/vlc/gui/helpers/hf/BaseHeadlessFragment.kt b/vlc-android/src/org/videolan/vlc/gui/helpers/hf/BaseHeadlessFragment.kt
index fc1b7916d..9ab70655f 100644
--- a/vlc-android/src/org/videolan/vlc/gui/helpers/hf/BaseHeadlessFragment.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/helpers/hf/BaseHeadlessFragment.kt
@@ -25,16 +25,16 @@ package org.videolan.vlc.gui.helpers.hf
 
 import android.content.Context
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentActivity
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
 import kotlinx.coroutines.experimental.channels.Channel
 import kotlinx.coroutines.experimental.channels.SendChannel
 import kotlinx.coroutines.experimental.launch
 import org.videolan.vlc.util.AppScope
 
 open class
-BaseHeadlessFragment : Fragment() {
-    protected var mActivity: FragmentActivity? = null
+BaseHeadlessFragment : androidx.fragment.app.Fragment() {
+    protected var mActivity: androidx.fragment.app.FragmentActivity? = null
     var channel: SendChannel<Unit>? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -44,7 +44,7 @@ BaseHeadlessFragment : Fragment() {
 
     override fun onAttach(context: Context?) {
         super.onAttach(context)
-        if (context is FragmentActivity) mActivity = context
+        if (context is androidx.fragment.app.FragmentActivity) mActivity = context
     }
 
     override fun onDetach() {
diff --git a/vlc-android/src/org/videolan/vlc/gui/helpers/hf/OtgAccess.kt b/vlc-android/src/org/videolan/vlc/gui/helpers/hf/OtgAccess.kt
index ab4f7e653..3f980f5d1 100644
--- a/vlc-android/src/org/videolan/vlc/gui/helpers/hf/OtgAccess.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/helpers/hf/OtgAccess.kt
@@ -20,14 +20,14 @@
 
 package org.videolan.vlc.gui.helpers.hf
 
-import android.arch.lifecycle.LiveData
+import androidx.lifecycle.LiveData
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import android.support.annotation.WorkerThread
-import android.support.v4.app.FragmentActivity
-import android.support.v4.provider.DocumentFile
+import androidx.annotation.WorkerThread
+import androidx.fragment.app.FragmentActivity
+import androidx.documentfile.provider.DocumentFile
 import android.util.Log
 import org.videolan.medialibrary.media.MediaWrapper
 import videolan.org.commontools.LiveEvent
@@ -53,7 +53,7 @@ class OtgAccess : BaseHeadlessFragment() {
     }
 
     companion object {
-        fun requestOtgRoot(activity: FragmentActivity?) {
+        fun requestOtgRoot(activity: androidx.fragment.app.FragmentActivity?) {
             activity?.supportFragmentManager?.beginTransaction()?.add(OtgAccess(), TAG)?.commitAllowingStateLoss()
         }
         var otgRoot : LiveData<Uri> = LiveEvent()
@@ -67,7 +67,7 @@ fun getDocumentFiles(context: Context, path: String) : List<MediaWrapper>? {
 //            .authority(OTG_CONTENT_AUTHORITY)
 //            .path(path.substringBefore(':'))
 //            .build()
-    var documentFile = DocumentFile.fromTreeUri(context, rootUri)
+    var documentFile = androidx.documentfile.provider.DocumentFile.fromTreeUri(context, rootUri)
 
     val parts = path.substringAfterLast(':').split("/".toRegex()).dropLastWhile { it.isEmpty() }
     for (part in parts) {
diff --git a/vlc-android/src/org/videolan/vlc/gui/helpers/hf/StoragePermissionsDelegate.kt b/vlc-android/src/org/videolan/vlc/gui/helpers/hf/StoragePermissionsDelegate.kt
index 0b4d78da7..007b404c8 100644
--- a/vlc-android/src/org/videolan/vlc/gui/helpers/hf/StoragePermissionsDelegate.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/helpers/hf/StoragePermissionsDelegate.kt
@@ -28,8 +28,8 @@ import android.annotation.TargetApi
 import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentActivity
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
 import kotlinx.coroutines.experimental.channels.Channel
 import org.videolan.libvlc.util.AndroidUtil
 import org.videolan.vlc.startMedialibrary
@@ -100,10 +100,10 @@ class StoragePermissionsDelegate : BaseHeadlessFragment() {
 
         const val TAG = "VLC/StorageHF"
 
-        fun askStoragePermission(activity: FragmentActivity, write: Boolean, cb: Runnable?) {
+        fun askStoragePermission(activity: androidx.fragment.app.FragmentActivity, write: Boolean, cb: Runnable?) {
             if (activity.isFinishing) return
             val fm = activity.supportFragmentManager
-            var fragment: Fragment? = fm.findFragmentByTag(TAG)
+            var fragment: androidx.fragment.app.Fragment? = fm.findFragmentByTag(TAG)
             val channel = if (cb != null) Channel<Unit>(1) else null
             if (fragment == null) {
                 val args = Bundle()
diff --git a/vlc-android/src/org/videolan/vlc/gui/helpers/hf/WriteExternalDelegate.kt b/vlc-android/src/org/videolan/vlc/gui/helpers/hf/WriteExternalDelegate.kt
index b35017adc..3fc263e11 100644
--- a/vlc-android/src/org/videolan/vlc/gui/helpers/hf/WriteExternalDelegate.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/helpers/hf/WriteExternalDelegate.kt
@@ -7,10 +7,10 @@ import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.provider.DocumentsContract
-import android.support.v4.app.FragmentActivity
-import android.support.v4.provider.DocumentFile
-import android.support.v7.app.AlertDialog
-import android.support.v7.preference.PreferenceManager
+import androidx.fragment.app.FragmentActivity
+import androidx.documentfile.provider.DocumentFile
+import androidx.appcompat.app.AlertDialog
+import androidx.preference.PreferenceManager
 import android.text.TextUtils
 import kotlinx.coroutines.experimental.channels.Channel
 import org.videolan.libvlc.util.AndroidUtil
@@ -62,13 +62,13 @@ class WriteExternalDelegate : BaseHeadlessFragment() {
                 Settings.getInstance(context).edit()
                         .putString("tree_uri_$storage", treeUri.toString())
                         .apply()
-                val treeFile = DocumentFile.fromTreeUri(context, treeUri)
+                val treeFile = androidx.documentfile.provider.DocumentFile.fromTreeUri(context, treeUri)
                 val contentResolver = context.contentResolver
 
                 // revoke access if a permission already exists
                 val persistedUriPermissions = contentResolver.persistedUriPermissions
                 for (uriPermission in persistedUriPermissions) {
-                    val file = DocumentFile.fromTreeUri(context, uriPermission.uri)
+                    val file = androidx.documentfile.provider.DocumentFile.fromTreeUri(context, uriPermission.uri)
                     if (treeFile?.name == file?.name) {
                         contentResolver.releasePersistableUriPermission(uriPermission.uri, Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
                         return
@@ -91,7 +91,7 @@ class WriteExternalDelegate : BaseHeadlessFragment() {
         private var permissions = VLCApplication.getAppContext().contentResolver.persistedUriPermissions
         private lateinit var storage: String
 
-        fun askForExtWrite(activity: FragmentActivity?, uri: Uri, cb: Runnable? = null) {
+        fun askForExtWrite(activity: androidx.fragment.app.FragmentActivity?, uri: Uri, cb: Runnable? = null) {
             if (activity === null) return
             val fragment = WriteExternalDelegate()
             val channel = if (cb != null) Channel<Unit>(1) else null
diff --git a/vlc-android/src/org/videolan/vlc/gui/network/MRLAdapter.kt b/vlc-android/src/org/videolan/vlc/gui/network/MRLAdapter.kt
index 19c803522..efade03e8 100644
--- a/vlc-android/src/org/videolan/vlc/gui/network/MRLAdapter.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/network/MRLAdapter.kt
@@ -20,9 +20,9 @@
  */
 package org.videolan.vlc.gui.network
 
-import android.databinding.DataBindingUtil
+import androidx.databinding.DataBindingUtil
 import android.net.Uri
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -31,7 +31,7 @@ import org.videolan.medialibrary.media.MediaWrapper
 import org.videolan.vlc.R
 import org.videolan.vlc.databinding.MrlItemBinding
 
-internal class MRLAdapter(private val eventActor: SendChannel<MrlAction>) : RecyclerView.Adapter<MRLAdapter.ViewHolder>() {
+internal class MRLAdapter(private val eventActor: SendChannel<MrlAction>) : androidx.recyclerview.widget.RecyclerView.Adapter<MRLAdapter.ViewHolder>() {
     private var dataset: Array<MediaWrapper>? = null
 
     val isEmpty: Boolean
@@ -62,7 +62,7 @@ internal class MRLAdapter(private val eventActor: SendChannel<MrlAction>) : Recy
 
     override fun getItemCount() = dataset?.size ?: 0
 
-    inner class ViewHolder(val binding: MrlItemBinding) : RecyclerView.ViewHolder(binding.root), View.OnClickListener {
+    inner class ViewHolder(val binding: MrlItemBinding) : androidx.recyclerview.widget.RecyclerView.ViewHolder(binding.root), View.OnClickListener {
 
         init {
             itemView.setOnClickListener(this)
diff --git a/vlc-android/src/org/videolan/vlc/gui/network/MRLPanelFragment.kt b/vlc-android/src/org/videolan/vlc/gui/network/MRLPanelFragment.kt
index 63517ec88..5aaf1024d 100644
--- a/vlc-android/src/org/videolan/vlc/gui/network/MRLPanelFragment.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/network/MRLPanelFragment.kt
@@ -20,15 +20,15 @@
  */
 package org.videolan.vlc.gui.network
 
-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProviders
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
 import android.net.Uri
 import android.os.Bundle
-import android.support.design.widget.TextInputLayout
-import android.support.v4.app.DialogFragment
-import android.support.v7.app.AlertDialog
-import android.support.v7.widget.DividerItemDecoration
-import android.support.v7.widget.LinearLayoutManager
+import com.google.android.material.textfield.TextInputLayout
+import androidx.fragment.app.DialogFragment
+import androidx.appcompat.app.AlertDialog
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
 import android.text.TextUtils
 import android.view.KeyEvent
 import android.view.LayoutInflater
@@ -54,10 +54,10 @@ import org.videolan.vlc.viewmodels.StreamsModel
 
 const val TAG = "VLC/MrlPanelFragment"
 
-class MRLPanelFragment : DialogFragment(), View.OnKeyListener, TextView.OnEditorActionListener, View.OnClickListener, CtxActionReceiver {
+class MRLPanelFragment : androidx.fragment.app.DialogFragment(), View.OnKeyListener, TextView.OnEditorActionListener, View.OnClickListener, CtxActionReceiver {
 
     private lateinit var adapter: MRLAdapter
-    private lateinit var editText: TextInputLayout
+    private lateinit var editText: com.google.android.material.textfield.TextInputLayout
     private lateinit var viewModel: StreamsModel
 
     private val listEventActor = coroutineScope.actor<MrlAction> {
@@ -69,7 +69,7 @@ class MRLPanelFragment : DialogFragment(), View.OnKeyListener, TextView.OnEditor
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setStyle(DialogFragment.STYLE_NO_FRAME, 0)
+        setStyle(androidx.fragment.app.DialogFragment.STYLE_NO_FRAME, 0)
         viewModel = ViewModelProviders.of(this).get(StreamsModel::class.java)
     }
 
@@ -82,8 +82,8 @@ class MRLPanelFragment : DialogFragment(), View.OnKeyListener, TextView.OnEditor
 
         adapter = MRLAdapter(listEventActor)
         val recyclerView = binding.mrlList
-        recyclerView.addItemDecoration(DividerItemDecoration(activity, DividerItemDecoration.VERTICAL))
-        recyclerView.layoutManager = LinearLayoutManager(activity)
+        recyclerView.addItemDecoration(androidx.recyclerview.widget.DividerItemDecoration(activity, androidx.recyclerview.widget.DividerItemDecoration.VERTICAL))
+        recyclerView.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(activity)
         recyclerView.adapter = adapter
         viewModel.observableHistory.observe(this, Observer { adapter.setList(it) })
         binding.play.setOnClickListener(this)
diff --git a/vlc-android/src/org/videolan/vlc/gui/preferences/BasePreferenceFragment.java b/vlc-android/src/org/videolan/vlc/gui/preferences/BasePreferenceFragment.java
index 80fa4e633..44c2672b7 100644
--- a/vlc-android/src/org/videolan/vlc/gui/preferences/BasePreferenceFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/preferences/BasePreferenceFragment.java
@@ -24,11 +24,11 @@
 package org.videolan.vlc.gui.preferences;
 
 import android.os.Bundle;
-import android.support.v14.preference.MultiSelectListPreference;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceFragmentCompat;
+import androidx.preference.MultiSelectListPreference;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
 
 import org.videolan.vlc.R;
 import org.videolan.vlc.gui.preferences.hack.MultiSelectListPreferenceDialogFragmentCompat;
diff --git a/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesActivity.java b/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesActivity.java
index cb04fc1ea..f254449d5 100644
--- a/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesActivity.java
@@ -23,10 +23,10 @@ package org.videolan.vlc.gui.preferences;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.design.widget.AppBarLayout;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import com.google.android.material.appbar.AppBarLayout;
+import androidx.core.view.ViewCompat;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 
 import org.videolan.vlc.PlaybackService;
diff --git a/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesAdvanced.java b/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesAdvanced.java
index 6d73e3de7..bffc1982f 100644
--- a/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesAdvanced.java
+++ b/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesAdvanced.java
@@ -28,9 +28,9 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.Uri;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.preference.EditTextPreference;
-import android.support.v7.preference.Preference;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.EditTextPreference;
+import androidx.preference.Preference;
 import android.widget.Toast;
 
 import org.videolan.medialibrary.Medialibrary;
diff --git a/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesAudio.java b/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesAudio.java
index 41aef72db..94396172c 100644
--- a/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesAudio.java
+++ b/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesAudio.java
@@ -25,9 +25,9 @@ package org.videolan.vlc.gui.preferences;
 import android.app.Activity;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v7.preference.CheckBoxPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.TwoStatePreference;
+import androidx.preference.CheckBoxPreference;
+import androidx.preference.Preference;
+import androidx.preference.TwoStatePreference;
 
 import org.videolan.libvlc.util.AndroidUtil;
 import org.videolan.libvlc.util.HWDecoderUtil;
diff --git a/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesExtensionFragment.java b/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesExtensionFragment.java
index 885029470..9b7fe734b 100644
--- a/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesExtensionFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesExtensionFragment.java
@@ -3,12 +3,12 @@ package org.videolan.vlc.gui.preferences;
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.design.widget.AppBarLayout;
-import android.support.v7.preference.CheckBoxPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.support.v7.preference.SwitchPreferenceCompat;
-import android.support.v7.preference.TwoStatePreference;
+import com.google.android.material.appbar.AppBarLayout;
+import androidx.preference.CheckBoxPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreferenceCompat;
+import androidx.preference.TwoStatePreference;
 
 import org.videolan.vlc.R;
 import org.videolan.vlc.extensions.ExtensionListing;
diff --git a/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesExtensions.java b/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesExtensions.java
index d1e93e8d0..bda76b527 100644
--- a/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesExtensions.java
+++ b/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesExtensions.java
@@ -5,11 +5,11 @@ import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.design.widget.AppBarLayout;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceScreen;
-import android.support.v7.widget.SwitchCompat;
+import com.google.android.material.appbar.AppBarLayout;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+import androidx.appcompat.widget.SwitchCompat;
 import android.view.View;
 
 import org.videolan.vlc.R;
diff --git a/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesFragment.java b/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesFragment.java
index ddfbf371b..4229247f7 100644
--- a/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesFragment.java
@@ -26,11 +26,11 @@ package org.videolan.vlc.gui.preferences;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentActivity;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
 import android.text.TextUtils;
 import android.view.View;
 
diff --git a/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesUi.java b/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesUi.java
index 8dfe8c0e6..58802c91d 100644
--- a/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesUi.java
+++ b/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesUi.java
@@ -25,10 +25,10 @@ package org.videolan.vlc.gui.preferences;
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatDelegate;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.SwitchPreferenceCompat;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreferenceCompat;
 
 import org.videolan.vlc.R;
 import org.videolan.vlc.gui.helpers.UiTools;
diff --git a/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesVideo.java b/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesVideo.java
index 942b80612..583d89e73 100644
--- a/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesVideo.java
+++ b/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesVideo.java
@@ -23,7 +23,7 @@
 package org.videolan.vlc.gui.preferences;
 
 import android.os.Bundle;
-import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
 
 import org.videolan.libvlc.util.AndroidUtil;
 import org.videolan.vlc.R;
diff --git a/vlc-android/src/org/videolan/vlc/gui/preferences/hack/MultiSelectListPreferenceDialogFragmentCompat.java b/vlc-android/src/org/videolan/vlc/gui/preferences/hack/MultiSelectListPreferenceDialogFragmentCompat.java
index d212db942..a2af9473f 100644
--- a/vlc-android/src/org/videolan/vlc/gui/preferences/hack/MultiSelectListPreferenceDialogFragmentCompat.java
+++ b/vlc-android/src/org/videolan/vlc/gui/preferences/hack/MultiSelectListPreferenceDialogFragmentCompat.java
@@ -4,11 +4,11 @@ import android.annotation.TargetApi;
 import android.content.DialogInterface;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v14.preference.MultiSelectListPreference;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.preference.DialogPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceDialogFragmentCompat;
+import androidx.preference.MultiSelectListPreference;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.DialogPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceDialogFragmentCompat;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/AboutActivity.kt b/vlc-android/src/org/videolan/vlc/gui/tv/AboutActivity.kt
index 0d1532d3d..21211e878 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/AboutActivity.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/AboutActivity.kt
@@ -1,12 +1,12 @@
 package org.videolan.vlc.gui.tv
 
 import android.os.Bundle
-import android.support.v4.app.FragmentActivity
+import androidx.fragment.app.FragmentActivity
 
 import org.videolan.vlc.R
 import org.videolan.vlc.gui.helpers.UiTools
 
-class AboutActivity : FragmentActivity() {
+class AboutActivity : androidx.fragment.app.FragmentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.about_main)
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/CardPresenter.java b/vlc-android/src/org/videolan/vlc/gui/tv/CardPresenter.java
index 8059098d1..655bd9ec8 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/CardPresenter.java
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/CardPresenter.java
@@ -29,9 +29,9 @@ import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
-import android.support.v17.leanback.widget.ImageCardView;
-import android.support.v17.leanback.widget.Presenter;
-import android.support.v4.content.ContextCompat;
+import androidx.leanback.widget.ImageCardView;
+import androidx.leanback.widget.Presenter;
+import androidx.core.content.ContextCompat;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/DetailsDescriptionPresenter.java b/vlc-android/src/org/videolan/vlc/gui/tv/DetailsDescriptionPresenter.java
index f3dc7b2c8..ebd1d235c 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/DetailsDescriptionPresenter.java
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/DetailsDescriptionPresenter.java
@@ -21,7 +21,7 @@
 package org.videolan.vlc.gui.tv;
 
 import android.net.Uri;
-import android.support.v17.leanback.widget.AbstractDetailsDescriptionPresenter;
+import androidx.leanback.widget.AbstractDetailsDescriptionPresenter;
 
 public class DetailsDescriptionPresenter extends
         AbstractDetailsDescriptionPresenter {
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/LicenceActivity.kt b/vlc-android/src/org/videolan/vlc/gui/tv/LicenceActivity.kt
index 5ff6dc115..4fb5d6060 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/LicenceActivity.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/LicenceActivity.kt
@@ -2,14 +2,14 @@ package org.videolan.vlc.gui.tv
 
 import android.graphics.Color
 import android.os.Bundle
-import android.support.v4.app.FragmentActivity
+import androidx.fragment.app.FragmentActivity
 import android.view.View
 import android.webkit.WebView
 
 import org.videolan.vlc.R
 import org.videolan.vlc.util.Util
 
-class LicenceActivity : FragmentActivity() {
+class LicenceActivity : androidx.fragment.app.FragmentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/MainTvActivity.java b/vlc-android/src/org/videolan/vlc/gui/tv/MainTvActivity.java
index 73084b3c0..5c6c4569c 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/MainTvActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/MainTvActivity.java
@@ -38,6 +38,8 @@ import org.videolan.vlc.gui.tv.browser.BaseTvActivity;
 import org.videolan.vlc.util.Permissions;
 import org.videolan.vlc.util.Util;
 
+import androidx.fragment.app.FragmentManager;
+
 @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
 public class MainTvActivity extends BaseTvActivity {
 
@@ -67,7 +69,7 @@ public class MainTvActivity extends BaseTvActivity {
 
         setContentView(R.layout.tv_main);
 
-        final android.support.v4.app.FragmentManager fragmentManager = getSupportFragmentManager();
+        final FragmentManager fragmentManager = getSupportFragmentManager();
         mBrowseFragment = (MainTvFragment) fragmentManager.findFragmentById(R.id.browse_fragment);
         mProgressBar = findViewById(R.id.tv_main_progress);
     }
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/MainTvFragment.kt b/vlc-android/src/org/videolan/vlc/gui/tv/MainTvFragment.kt
index 22ec517e9..07aa87560 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/MainTvFragment.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/MainTvFragment.kt
@@ -23,16 +23,16 @@
 
 package org.videolan.vlc.gui.tv
 
-import android.arch.lifecycle.LiveData
-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProviders
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
 import android.content.Intent
 import android.content.SharedPreferences
 import android.os.Bundle
-import android.support.v17.leanback.app.BackgroundManager
-import android.support.v17.leanback.app.BrowseSupportFragment
-import android.support.v17.leanback.widget.*
-import android.support.v4.content.ContextCompat
+import androidx.leanback.app.BackgroundManager
+import androidx.leanback.app.BrowseSupportFragment
+import androidx.leanback.widget.*
+import androidx.core.content.ContextCompat
 import android.view.View
 import kotlinx.coroutines.experimental.launch
 import org.videolan.libvlc.util.AndroidUtil
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/MediaItemDetailsFragment.java b/vlc-android/src/org/videolan/vlc/gui/tv/MediaItemDetailsFragment.java
index 313162fb4..328fab2c5 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/MediaItemDetailsFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/MediaItemDetailsFragment.java
@@ -27,18 +27,18 @@ import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v17.leanback.app.BackgroundManager;
-import android.support.v17.leanback.app.DetailsSupportFragment;
-import android.support.v17.leanback.widget.Action;
-import android.support.v17.leanback.widget.ArrayObjectAdapter;
-import android.support.v17.leanback.widget.ClassPresenterSelector;
-import android.support.v17.leanback.widget.DetailsOverviewRow;
-import android.support.v17.leanback.widget.FullWidthDetailsOverviewRowPresenter;
-import android.support.v17.leanback.widget.ListRow;
-import android.support.v17.leanback.widget.ListRowPresenter;
-import android.support.v17.leanback.widget.OnActionClickedListener;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.content.ContextCompat;
+import androidx.leanback.app.BackgroundManager;
+import androidx.leanback.app.DetailsSupportFragment;
+import androidx.leanback.widget.Action;
+import androidx.leanback.widget.ArrayObjectAdapter;
+import androidx.leanback.widget.ClassPresenterSelector;
+import androidx.leanback.widget.DetailsOverviewRow;
+import androidx.leanback.widget.FullWidthDetailsOverviewRowPresenter;
+import androidx.leanback.widget.ListRow;
+import androidx.leanback.widget.ListRowPresenter;
+import androidx.leanback.widget.OnActionClickedListener;
+import androidx.fragment.app.FragmentActivity;
+import androidx.core.content.ContextCompat;
 import android.text.TextUtils;
 import android.widget.Toast;
 
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/NowPlayingDelegate.kt b/vlc-android/src/org/videolan/vlc/gui/tv/NowPlayingDelegate.kt
index 801d75bcc..09b8104b8 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/NowPlayingDelegate.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/NowPlayingDelegate.kt
@@ -1,6 +1,6 @@
 package org.videolan.vlc.gui.tv
 
-import android.arch.lifecycle.Observer
+import androidx.lifecycle.Observer
 import org.videolan.libvlc.MediaPlayer
 import org.videolan.medialibrary.media.DummyItem
 import org.videolan.vlc.PlaybackService
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/SearchActivity.java b/vlc-android/src/org/videolan/vlc/gui/tv/SearchActivity.java
index cbceff426..1ddace811 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/SearchActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/SearchActivity.java
@@ -23,7 +23,7 @@ package org.videolan.vlc.gui.tv;
 import android.annotation.TargetApi;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
 
 import org.videolan.vlc.R;
 
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/SearchFragment.kt b/vlc-android/src/org/videolan/vlc/gui/tv/SearchFragment.kt
index a6520258d..2dd8afb86 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/SearchFragment.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/SearchFragment.kt
@@ -26,8 +26,8 @@ import android.app.SearchManager
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
-import android.support.v17.leanback.app.SearchSupportFragment
-import android.support.v17.leanback.widget.*
+import androidx.leanback.app.SearchSupportFragment
+import androidx.leanback.widget.*
 import android.text.TextUtils
 import kotlinx.coroutines.experimental.launch
 import org.videolan.medialibrary.Tools
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/TimeUpdater.kt b/vlc-android/src/org/videolan/vlc/gui/tv/TimeUpdater.kt
index 2070d297c..8e3826809 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/TimeUpdater.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/TimeUpdater.kt
@@ -21,14 +21,14 @@
 package org.videolan.vlc.gui.tv
 
 import android.app.Activity
-import android.arch.lifecycle.Lifecycle
-import android.arch.lifecycle.LifecycleObserver
-import android.arch.lifecycle.OnLifecycleEvent
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.OnLifecycleEvent
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.support.v4.app.FragmentActivity
+import androidx.fragment.app.FragmentActivity
 import android.widget.TextView
 import java.util.*
 
@@ -57,4 +57,4 @@ class TimeUpdater(private val activity: Activity, private val tv: TextView) : Li
     }
 }
 
-fun FragmentActivity.registerTimeView(tv: TextView?) = tv?.let { lifecycle.addObserver(TimeUpdater(this, it)) }
\ No newline at end of file
+fun androidx.fragment.app.FragmentActivity.registerTimeView(tv: TextView?) = tv?.let { lifecycle.addObserver(TimeUpdater(this, it)) }
\ No newline at end of file
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/TvUtil.kt b/vlc-android/src/org/videolan/vlc/gui/tv/TvUtil.kt
index a8666c6a2..7cda8fcb5 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/TvUtil.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/TvUtil.kt
@@ -28,13 +28,13 @@ import android.graphics.Bitmap
 import android.graphics.drawable.BitmapDrawable
 import android.net.Uri
 import android.os.Build
-import android.support.annotation.RequiresApi
-import android.support.v17.leanback.app.BackgroundManager
-import android.support.v17.leanback.widget.DiffCallback
-import android.support.v17.leanback.widget.ListRow
-import android.support.v17.leanback.widget.Row
-import android.support.v4.app.FragmentActivity
-import android.support.v4.content.ContextCompat
+import androidx.annotation.RequiresApi
+import androidx.leanback.app.BackgroundManager
+import androidx.leanback.widget.DiffCallback
+import androidx.leanback.widget.ListRow
+import androidx.leanback.widget.Row
+import androidx.fragment.app.FragmentActivity
+import androidx.core.content.ContextCompat
 import android.text.TextUtils
 import android.view.View
 import kotlinx.coroutines.experimental.Dispatchers
@@ -109,7 +109,7 @@ object TvUtil {
             MediaUtils.openMedia(activity, media)
     }
 
-    fun openMedia(activity: FragmentActivity, item: Any?, row: Row?) {
+    fun openMedia(activity: androidx.fragment.app.FragmentActivity, item: Any?, row: Row?) {
         when (item) {
             is MediaWrapper -> when {
                 item.type == MediaWrapper.TYPE_AUDIO -> openAudioCategory(activity, item)
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/audioplayer/AudioPlayerActivity.java b/vlc-android/src/org/videolan/vlc/gui/tv/audioplayer/AudioPlayerActivity.java
index 0d79a5a8d..c502b9238 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/audioplayer/AudioPlayerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/audioplayer/AudioPlayerActivity.java
@@ -21,15 +21,15 @@
 package org.videolan.vlc.gui.tv.audioplayer;
 
 import android.annotation.TargetApi;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
 import android.content.SharedPreferences;
-import android.databinding.DataBindingUtil;
+import androidx.databinding.DataBindingUtil;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v7.widget.DividerItemDecoration;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.text.TextUtils;
 import android.view.InputDevice;
 import android.view.KeyEvent;
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/audioplayer/PlaylistAdapter.java b/vlc-android/src/org/videolan/vlc/gui/tv/audioplayer/PlaylistAdapter.java
index 608605e22..7d69955bb 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/audioplayer/PlaylistAdapter.java
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/audioplayer/PlaylistAdapter.java
@@ -21,7 +21,7 @@
 package org.videolan.vlc.gui.tv.audioplayer;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/browser/AlbumsFragment.kt b/vlc-android/src/org/videolan/vlc/gui/tv/browser/AlbumsFragment.kt
index 3db2afd5f..110a06e7b 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/browser/AlbumsFragment.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/browser/AlbumsFragment.kt
@@ -1,7 +1,7 @@
 package org.videolan.vlc.gui.tv.browser
 
-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProviders
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
 import android.os.Bundle
 import org.videolan.vlc.R
 import org.videolan.vlc.viewmodels.audio.AlbumModel
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/browser/ArtistsFragment.kt b/vlc-android/src/org/videolan/vlc/gui/tv/browser/ArtistsFragment.kt
index 42cf43a9e..1fcca882f 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/browser/ArtistsFragment.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/browser/ArtistsFragment.kt
@@ -1,7 +1,7 @@
 package org.videolan.vlc.gui.tv.browser
 
-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProviders
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
 import android.os.Bundle
 import org.videolan.vlc.R
 import org.videolan.vlc.viewmodels.audio.ArtistModel
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/browser/BaseTvActivity.java b/vlc-android/src/org/videolan/vlc/gui/tv/browser/BaseTvActivity.java
index d774b64ff..e57c15957 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/browser/BaseTvActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/browser/BaseTvActivity.java
@@ -24,13 +24,13 @@
 package org.videolan.vlc.gui.tv.browser;
 
 import android.annotation.TargetApi;
-import android.arch.lifecycle.Observer;
+import androidx.lifecycle.Observer;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.KeyEvent;
 import android.widget.TextView;
 
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/browser/BrowserGridFragment.java b/vlc-android/src/org/videolan/vlc/gui/tv/browser/BrowserGridFragment.java
index 090180739..4d756a0c6 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/browser/BrowserGridFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/browser/BrowserGridFragment.java
@@ -24,17 +24,17 @@
 package org.videolan.vlc.gui.tv.browser;
 
 import android.annotation.TargetApi;
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v17.leanback.widget.OnItemViewClickedListener;
-import android.support.v17.leanback.widget.OnItemViewSelectedListener;
-import android.support.v17.leanback.widget.Presenter;
-import android.support.v17.leanback.widget.Row;
-import android.support.v17.leanback.widget.RowPresenter;
+import androidx.annotation.Nullable;
+import androidx.leanback.widget.OnItemViewClickedListener;
+import androidx.leanback.widget.OnItemViewSelectedListener;
+import androidx.leanback.widget.Presenter;
+import androidx.leanback.widget.Row;
+import androidx.leanback.widget.RowPresenter;
 import android.util.Log;
 
 import org.videolan.medialibrary.media.MediaLibraryItem;
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/browser/CategoriesFragment.kt b/vlc-android/src/org/videolan/vlc/gui/tv/browser/CategoriesFragment.kt
index 72ffe15fd..36aa9aa8b 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/browser/CategoriesFragment.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/browser/CategoriesFragment.kt
@@ -25,10 +25,10 @@ package org.videolan.vlc.gui.tv.browser
 
 import android.content.SharedPreferences
 import android.os.Bundle
-import android.support.v17.leanback.app.BackgroundManager
-import android.support.v17.leanback.app.BrowseSupportFragment
-import android.support.v17.leanback.widget.*
-import android.support.v4.content.ContextCompat
+import androidx.leanback.app.BackgroundManager
+import androidx.leanback.app.BrowseSupportFragment
+import androidx.leanback.widget.*
+import androidx.core.content.ContextCompat
 import android.view.View
 import android.widget.ImageView
 import org.videolan.medialibrary.media.MediaLibraryItem
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/browser/DirectoryBrowserFragment.java b/vlc-android/src/org/videolan/vlc/gui/tv/browser/DirectoryBrowserFragment.java
index 84b0ac343..b71836b5e 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/browser/DirectoryBrowserFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/browser/DirectoryBrowserFragment.java
@@ -24,11 +24,11 @@
 package org.videolan.vlc.gui.tv.browser;
 
 import android.annotation.TargetApi;
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.videolan.medialibrary.media.MediaLibraryItem;
 import org.videolan.vlc.viewmodels.browser.BrowserModel;
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/browser/GenresFragment.kt b/vlc-android/src/org/videolan/vlc/gui/tv/browser/GenresFragment.kt
index aaea59eed..358c5c9a9 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/browser/GenresFragment.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/browser/GenresFragment.kt
@@ -1,7 +1,7 @@
 package org.videolan.vlc.gui.tv.browser
 
-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProviders
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
 import android.os.Bundle
 import org.videolan.vlc.R
 import org.videolan.vlc.viewmodels.audio.GenresModel
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/browser/GridFragment.java b/vlc-android/src/org/videolan/vlc/gui/tv/browser/GridFragment.java
index 49666c035..847019a9f 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/browser/GridFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/browser/GridFragment.java
@@ -21,10 +21,10 @@
 package org.videolan.vlc.gui.tv.browser;
 
 import android.os.Bundle;
-import android.support.v17.leanback.app.VerticalGridSupportFragment;
-import android.support.v17.leanback.widget.ArrayObjectAdapter;
-import android.support.v17.leanback.widget.VerticalGridPresenter;
-import android.support.v4.app.FragmentActivity;
+import androidx.leanback.app.VerticalGridSupportFragment;
+import androidx.leanback.widget.ArrayObjectAdapter;
+import androidx.leanback.widget.VerticalGridPresenter;
+import androidx.fragment.app.FragmentActivity;
 
 import org.videolan.vlc.gui.tv.CardPresenter;
 import org.videolan.vlc.gui.tv.browser.interfaces.BrowserFragmentInterface;
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/browser/MediaLibBrowserFragment.kt b/vlc-android/src/org/videolan/vlc/gui/tv/browser/MediaLibBrowserFragment.kt
index 1a14313b2..87bc2babb 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/browser/MediaLibBrowserFragment.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/browser/MediaLibBrowserFragment.kt
@@ -28,10 +28,10 @@ import android.content.SharedPreferences
 import android.os.Build
 import android.os.Bundle
 import android.os.Parcelable
-import android.support.annotation.RequiresApi
-import android.support.v17.leanback.app.BackgroundManager
-import android.support.v17.leanback.widget.*
-import android.support.v4.content.ContextCompat
+import androidx.annotation.RequiresApi
+import androidx.leanback.app.BackgroundManager
+import androidx.leanback.widget.*
+import androidx.core.content.ContextCompat
 import android.widget.ImageView
 import org.videolan.medialibrary.media.MediaLibraryItem
 import org.videolan.vlc.R
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/browser/MusicFragment.kt b/vlc-android/src/org/videolan/vlc/gui/tv/browser/MusicFragment.kt
index 4c15b46cd..214daae57 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/browser/MusicFragment.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/browser/MusicFragment.kt
@@ -23,8 +23,8 @@
 
 package org.videolan.vlc.gui.tv.browser
 
-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProviders
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
 import android.os.Bundle
 import org.videolan.vlc.R
 import org.videolan.vlc.viewmodels.audio.TracksModel
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/browser/NetworkBrowserFragment.java b/vlc-android/src/org/videolan/vlc/gui/tv/browser/NetworkBrowserFragment.java
index b056636dc..2e60306a9 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/browser/NetworkBrowserFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/browser/NetworkBrowserFragment.java
@@ -24,16 +24,16 @@
 package org.videolan.vlc.gui.tv.browser;
 
 import android.annotation.TargetApi;
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.annotation.Nullable;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import org.videolan.medialibrary.media.MediaLibraryItem;
 import org.videolan.vlc.ExternalMonitor;
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/browser/SongsBrowserFragment.java b/vlc-android/src/org/videolan/vlc/gui/tv/browser/SongsBrowserFragment.java
index 5b80681c5..4509e961b 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/browser/SongsBrowserFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/browser/SongsBrowserFragment.java
@@ -25,13 +25,13 @@
 package org.videolan.vlc.gui.tv.browser;
 
 import android.annotation.TargetApi;
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v17.leanback.widget.Presenter;
-import android.support.v17.leanback.widget.Row;
-import android.support.v17.leanback.widget.RowPresenter;
+import androidx.leanback.widget.Presenter;
+import androidx.leanback.widget.Row;
+import androidx.leanback.widget.RowPresenter;
 import android.text.TextUtils;
 
 import org.jetbrains.annotations.Nullable;
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/browser/VerticalGridActivity.java b/vlc-android/src/org/videolan/vlc/gui/tv/browser/VerticalGridActivity.java
index 05b4fd5d5..b2702e877 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/browser/VerticalGridActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/browser/VerticalGridActivity.java
@@ -24,7 +24,7 @@ import android.annotation.TargetApi;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.ProgressBar;
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/browser/VideoBrowserFragment.kt b/vlc-android/src/org/videolan/vlc/gui/tv/browser/VideoBrowserFragment.kt
index a8a1a3b9e..2ca86023e 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/browser/VideoBrowserFragment.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/browser/VideoBrowserFragment.kt
@@ -24,7 +24,7 @@
 package org.videolan.vlc.gui.tv.browser
 
 import android.annotation.TargetApi
-import android.arch.lifecycle.Observer
+import androidx.lifecycle.Observer
 import android.os.Build
 import android.os.Bundle
 import org.videolan.vlc.util.KEY_GROUP
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/browser/VideosFragment.kt b/vlc-android/src/org/videolan/vlc/gui/tv/browser/VideosFragment.kt
index c047ef035..5b229d604 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/browser/VideosFragment.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/browser/VideosFragment.kt
@@ -1,6 +1,6 @@
 package org.videolan.vlc.gui.tv.browser
 
-import android.arch.lifecycle.Observer
+import androidx.lifecycle.Observer
 import android.os.Bundle
 import org.videolan.vlc.R
 import org.videolan.vlc.util.KEY_GROUP
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/preferences/BasePreferenceFragment.java b/vlc-android/src/org/videolan/vlc/gui/tv/preferences/BasePreferenceFragment.java
index ac30b6db7..0a9a1cfc6 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/preferences/BasePreferenceFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/preferences/BasePreferenceFragment.java
@@ -27,7 +27,7 @@ import android.annotation.TargetApi;
 import android.app.Fragment;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v17.preference.LeanbackPreferenceFragment;
+import androidx.leanback.preference.LeanbackPreferenceFragment;
 
 import org.videolan.vlc.R;
 
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/preferences/PreferencesActivity.java b/vlc-android/src/org/videolan/vlc/gui/tv/preferences/PreferencesActivity.java
index a61af8103..ded569919 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/preferences/PreferencesActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/preferences/PreferencesActivity.java
@@ -28,7 +28,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
 import android.view.MenuItem;
 
 import org.videolan.vlc.PlaybackService;
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/preferences/PreferencesAdvanced.java b/vlc-android/src/org/videolan/vlc/gui/tv/preferences/PreferencesAdvanced.java
index b932ac75f..15811fb84 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/preferences/PreferencesAdvanced.java
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/preferences/PreferencesAdvanced.java
@@ -31,8 +31,8 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Build;
-import android.support.v7.preference.EditTextPreference;
-import android.support.v7.preference.Preference;
+import androidx.preference.EditTextPreference;
+import androidx.preference.Preference;
 import android.widget.Toast;
 
 import org.videolan.vlc.R;
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/preferences/PreferencesAudio.java b/vlc-android/src/org/videolan/vlc/gui/tv/preferences/PreferencesAudio.java
index 7c35551e5..743d06984 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/preferences/PreferencesAudio.java
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/preferences/PreferencesAudio.java
@@ -26,7 +26,7 @@ import android.annotation.TargetApi;
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v7.preference.CheckBoxPreference;
+import androidx.preference.CheckBoxPreference;
 
 import org.videolan.libvlc.util.AndroidUtil;
 import org.videolan.libvlc.util.HWDecoderUtil;
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/preferences/PreferencesFragment.java b/vlc-android/src/org/videolan/vlc/gui/tv/preferences/PreferencesFragment.java
index 2ad87e581..2880cea80 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/preferences/PreferencesFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/preferences/PreferencesFragment.java
@@ -27,8 +27,8 @@ import android.annotation.TargetApi;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
-import android.support.v7.preference.Preference;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.Preference;
 import android.widget.Toast;
 
 import org.videolan.vlc.R;
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/preferences/PreferencesUi.java b/vlc-android/src/org/videolan/vlc/gui/tv/preferences/PreferencesUi.java
index eb693e274..0b84c195f 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/preferences/PreferencesUi.java
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/preferences/PreferencesUi.java
@@ -27,7 +27,7 @@ import android.annotation.TargetApi;
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v7.preference.ListPreference;
+import androidx.preference.ListPreference;
 
 import org.videolan.vlc.R;
 import org.videolan.vlc.gui.helpers.UiTools;
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/preferences/PreferencesVideo.java b/vlc-android/src/org/videolan/vlc/gui/tv/preferences/PreferencesVideo.java
index ef73acfc6..e7cc14079 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/preferences/PreferencesVideo.java
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/preferences/PreferencesVideo.java
@@ -25,7 +25,7 @@ package org.videolan.vlc.gui.tv.preferences;
 import android.annotation.TargetApi;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
 
 import org.videolan.vlc.R;
 import org.videolan.vlc.util.AndroidDevices;
diff --git a/vlc-android/src/org/videolan/vlc/gui/video/DisplayManager.kt b/vlc-android/src/org/videolan/vlc/gui/video/DisplayManager.kt
index d5653616b..d829bb928 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/DisplayManager.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/video/DisplayManager.kt
@@ -3,7 +3,7 @@ package org.videolan.vlc.gui.video
 import android.annotation.TargetApi
 import android.app.Activity
 import android.app.Presentation
-import android.arch.lifecycle.Observer
+import androidx.lifecycle.Observer
 import android.content.Context
 import android.content.DialogInterface
 import android.graphics.PixelFormat
diff --git a/vlc-android/src/org/videolan/vlc/gui/video/MediaInfoAdapter.java b/vlc-android/src/org/videolan/vlc/gui/video/MediaInfoAdapter.java
index 7c7f1fbb6..a36973336 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/MediaInfoAdapter.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/MediaInfoAdapter.java
@@ -22,7 +22,7 @@ package org.videolan.vlc.gui.video;
 
 import android.content.Context;
 import android.content.res.Resources;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/vlc-android/src/org/videolan/vlc/gui/video/PopupManager.java b/vlc-android/src/org/videolan/vlc/gui/video/PopupManager.java
index e41bf3170..8ec1117b8 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/PopupManager.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/PopupManager.java
@@ -30,8 +30,8 @@ import android.content.Intent;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.view.GestureDetectorCompat;
+import androidx.core.app.NotificationCompat;
+import androidx.core.view.GestureDetectorCompat;
 import android.util.Log;
 import android.view.GestureDetector;
 import android.view.LayoutInflater;
diff --git a/vlc-android/src/org/videolan/vlc/gui/video/VideoGridAnimator.java b/vlc-android/src/org/videolan/vlc/gui/video/VideoGridAnimator.java
index e8857eafb..9ec60d61c 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoGridAnimator.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoGridAnimator.java
@@ -22,7 +22,7 @@ package org.videolan.vlc.gui.video;
 
 import android.annotation.TargetApi;
 import android.os.Build;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/vlc-android/src/org/videolan/vlc/gui/video/VideoGridFragment.java b/vlc-android/src/org/videolan/vlc/gui/video/VideoGridFragment.java
index 819cd8b7e..f434dd05e 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoGridFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoGridFragment.java
@@ -22,8 +22,8 @@ package org.videolan.vlc.gui.video;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.content.res.Resources;
@@ -31,11 +31,11 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.annotation.MainThread;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.view.ActionMode;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.MainThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.view.ActionMode;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
diff --git a/vlc-android/src/org/videolan/vlc/gui/video/VideoListAdapter.java b/vlc-android/src/org/videolan/vlc/gui/video/VideoListAdapter.java
index 4bb7a0fc0..c35b332ee 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoListAdapter.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoListAdapter.java
@@ -22,14 +22,14 @@ package org.videolan.vlc.gui.video;
 
 import android.annotation.TargetApi;
 import android.content.Context;
-import android.databinding.BindingAdapter;
-import android.databinding.DataBindingUtil;
-import android.databinding.ObservableBoolean;
-import android.databinding.ViewDataBinding;
+import androidx.databinding.BindingAdapter;
+import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ObservableBoolean;
+import androidx.databinding.ViewDataBinding;
 import android.os.Build;
-import android.support.annotation.MainThread;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.GridLayoutManager;
+import androidx.annotation.MainThread;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.GridLayoutManager;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
index 81dfb479f..437f3ee89 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
@@ -25,9 +25,9 @@ import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.KeyguardManager;
 import android.app.PictureInPictureParams;
-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
 import android.bluetooth.BluetoothA2dp;
 import android.bluetooth.BluetoothHeadset;
 import android.content.BroadcastReceiver;
@@ -38,8 +38,8 @@ import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
-import android.databinding.BindingAdapter;
-import android.databinding.DataBindingUtil;
+import androidx.databinding.BindingAdapter;
+import androidx.databinding.DataBindingUtil;
 import android.graphics.Color;
 import android.graphics.PixelFormat;
 import android.media.AudioManager;
@@ -50,18 +50,18 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import android.os.PowerManager;
-import android.support.annotation.NonNull;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.PopupMenu;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.ViewStubCompat;
-import android.support.v7.widget.helper.ItemTouchHelper;
+import androidx.annotation.NonNull;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.fragment.app.FragmentManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.appcompat.widget.PopupMenu;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.ViewStubCompat;
+import androidx.recyclerview.widget.ItemTouchHelper;
 import android.text.TextUtils;
 import android.text.format.DateFormat;
 import android.util.DisplayMetrics;
@@ -2470,7 +2470,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
                 mRendererBtn = findViewById(R.id.video_renderer);
                 RendererDelegate.INSTANCE.getSelectedRenderer().observe(this, new Observer<RendererItem>() {
                     @Override
-                    public void onChanged(@android.support.annotation.Nullable RendererItem rendererItem) {
+                    public void onChanged(@androidx.annotation.Nullable RendererItem rendererItem) {
                         if (mRendererBtn != null) mRendererBtn.setImageResource(rendererItem == null ? R.drawable.ic_renderer_circle : R.drawable.ic_renderer_on_circle);
                     }
                 });
@@ -2828,7 +2828,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
     private Observer downloadedSubtitleObserver = new Observer<List<ExternalSub>>() {
         @Override
         public void onChanged
-                (@android.support.annotation.Nullable List < ExternalSub > externalSubs) {
+                (@androidx.annotation.Nullable List < ExternalSub > externalSubs) {
             for (ExternalSub externalSub : externalSubs) {
                 if (!addedExternalSubs.contains(externalSub)) {
                     mService.addSubtitleTrack(externalSub.getSubtitlePath(), false);
diff --git a/vlc-android/src/org/videolan/vlc/gui/video/VideoTouchDelegate.kt b/vlc-android/src/org/videolan/vlc/gui/video/VideoTouchDelegate.kt
index 7948350e0..aa8313f56 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoTouchDelegate.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoTouchDelegate.kt
@@ -2,8 +2,8 @@ package org.videolan.vlc.gui.video
 
 import android.content.res.Configuration
 import android.media.AudioManager
-import android.support.v4.view.GestureDetectorCompat
-import android.support.v4.view.ScaleGestureDetectorCompat
+import androidx.core.view.GestureDetectorCompat
+import androidx.core.view.ScaleGestureDetectorCompat
 import android.util.DisplayMetrics
 import android.view.*
 import org.videolan.medialibrary.Tools
diff --git a/vlc-android/src/org/videolan/vlc/gui/video/benchmark/BenchActivity.java b/vlc-android/src/org/videolan/vlc/gui/video/benchmark/BenchActivity.java
index 363132ef4..f7c4faae0 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/benchmark/BenchActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/benchmark/BenchActivity.java
@@ -36,8 +36,8 @@ import android.media.projection.MediaProjectionManager;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.View;
diff --git a/vlc-android/src/org/videolan/vlc/gui/view/AutoFitRecyclerView.java b/vlc-android/src/org/videolan/vlc/gui/view/AutoFitRecyclerView.java
index 00b537cb4..e1dd205e7 100644
--- a/vlc-android/src/org/videolan/vlc/gui/view/AutoFitRecyclerView.java
+++ b/vlc-android/src/org/videolan/vlc/gui/view/AutoFitRecyclerView.java
@@ -25,8 +25,8 @@ package org.videolan.vlc.gui.view;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.Display;
 import android.view.WindowManager;
diff --git a/vlc-android/src/org/videolan/vlc/gui/view/ClickableSwitchPreference.java b/vlc-android/src/org/videolan/vlc/gui/view/ClickableSwitchPreference.java
index 35ed6d16a..435c45abb 100644
--- a/vlc-android/src/org/videolan/vlc/gui/view/ClickableSwitchPreference.java
+++ b/vlc-android/src/org/videolan/vlc/gui/view/ClickableSwitchPreference.java
@@ -1,9 +1,9 @@
 package org.videolan.vlc.gui.view;
 
 import android.content.Context;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.support.v7.preference.TwoStatePreference;
-import android.support.v7.widget.SwitchCompat;
+import androidx.preference.PreferenceViewHolder;
+import androidx.preference.TwoStatePreference;
+import androidx.appcompat.widget.SwitchCompat;
 import android.view.View;
 import android.widget.CompoundButton;
 
@@ -13,13 +13,13 @@ public class ClickableSwitchPreference extends TwoStatePreference {
     private View.OnClickListener switchClickListener;
 
     public ClickableSwitchPreference(Context context) {
-        super(context, null, android.support.v7.preference.R.attr.switchPreferenceCompatStyle, 0);
+        super(context, null, androidx.preference.R.attr.switchPreferenceCompatStyle, 0);
     }
 
     @Override
     public void onBindViewHolder(PreferenceViewHolder holder) {
         super.onBindViewHolder(holder);
-        switchView = holder.findViewById(android.support.v7.preference.R.id.switchWidget);
+        switchView = holder.findViewById(androidx.preference.R.id.switchWidget);
         switchView.setOnClickListener(switchClickListener);
 
         //for some reason, it does not initialize itself;
diff --git a/vlc-android/src/org/videolan/vlc/gui/view/FastScroller.java b/vlc-android/src/org/videolan/vlc/gui/view/FastScroller.java
index 826da33b7..623177523 100644
--- a/vlc-android/src/org/videolan/vlc/gui/view/FastScroller.java
+++ b/vlc-android/src/org/videolan/vlc/gui/view/FastScroller.java
@@ -33,8 +33,8 @@ import android.content.Context;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Message;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
diff --git a/vlc-android/src/org/videolan/vlc/gui/view/HackyDrawerLayout.java b/vlc-android/src/org/videolan/vlc/gui/view/HackyDrawerLayout.java
index c1dac81ab..43a4dc980 100644
--- a/vlc-android/src/org/videolan/vlc/gui/view/HackyDrawerLayout.java
+++ b/vlc-android/src/org/videolan/vlc/gui/view/HackyDrawerLayout.java
@@ -23,7 +23,7 @@
 package org.videolan.vlc.gui.view;
 
 import android.content.Context;
-import android.support.v4.widget.DrawerLayout;
+import androidx.drawerlayout.widget.DrawerLayout;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
diff --git a/vlc-android/src/org/videolan/vlc/gui/view/PopupLayout.java b/vlc-android/src/org/videolan/vlc/gui/view/PopupLayout.java
index c6ec4720e..4f7ccf700 100644
--- a/vlc-android/src/org/videolan/vlc/gui/view/PopupLayout.java
+++ b/vlc-android/src/org/videolan/vlc/gui/view/PopupLayout.java
@@ -29,7 +29,7 @@ import android.content.Context;
 import android.graphics.PixelFormat;
 import android.graphics.Point;
 import android.os.Build;
-import android.support.v4.view.GestureDetectorCompat;
+import androidx.core.view.GestureDetectorCompat;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.MotionEvent;
diff --git a/vlc-android/src/org/videolan/vlc/gui/view/SwipeRefreshLayout.java b/vlc-android/src/org/videolan/vlc/gui/view/SwipeRefreshLayout.java
index a2ae67619..9e3d3e506 100644
--- a/vlc-android/src/org/videolan/vlc/gui/view/SwipeRefreshLayout.java
+++ b/vlc-android/src/org/videolan/vlc/gui/view/SwipeRefreshLayout.java
@@ -26,7 +26,7 @@ import android.content.Context;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
-public class SwipeRefreshLayout extends android.support.v4.widget.SwipeRefreshLayout {
+public class SwipeRefreshLayout extends androidx.swiperefreshlayout.widget.SwipeRefreshLayout {
     public SwipeRefreshLayout(Context context) {
         super(context);
     }
diff --git a/vlc-android/src/org/videolan/vlc/gui/view/VerticalSeekBar.java b/vlc-android/src/org/videolan/vlc/gui/view/VerticalSeekBar.java
index bbc435c0d..d644c09ac 100644
--- a/vlc-android/src/org/videolan/vlc/gui/view/VerticalSeekBar.java
+++ b/vlc-android/src/org/videolan/vlc/gui/view/VerticalSeekBar.java
@@ -22,7 +22,7 @@ package org.videolan.vlc.gui.view;
 
 import android.content.Context;
 import android.graphics.Canvas;
-import android.support.v7.widget.AppCompatSeekBar;
+import androidx.appcompat.widget.AppCompatSeekBar;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.widget.SeekBar;
diff --git a/vlc-android/src/org/videolan/vlc/gui/wizard/MLWizardActivity.kt b/vlc-android/src/org/videolan/vlc/gui/wizard/MLWizardActivity.kt
index 4489cb1e7..bba56c51a 100644
--- a/vlc-android/src/org/videolan/vlc/gui/wizard/MLWizardActivity.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/wizard/MLWizardActivity.kt
@@ -25,9 +25,9 @@ package org.videolan.vlc.gui.wizard
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
-import android.databinding.DataBindingUtil
+import androidx.databinding.DataBindingUtil
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.view.View
 import kotlinx.coroutines.experimental.Dispatchers
 import kotlinx.coroutines.experimental.launch
diff --git a/vlc-android/src/org/videolan/vlc/interfaces/IEventsHandler.kt b/vlc-android/src/org/videolan/vlc/interfaces/IEventsHandler.kt
index 92ecf13a5..9da6671e4 100644
--- a/vlc-android/src/org/videolan/vlc/interfaces/IEventsHandler.kt
+++ b/vlc-android/src/org/videolan/vlc/interfaces/IEventsHandler.kt
@@ -1,6 +1,6 @@
 package org.videolan.vlc.interfaces
 
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.View
 
 import org.videolan.medialibrary.media.MediaLibraryItem
@@ -9,5 +9,5 @@ interface IEventsHandler {
     fun onClick(v: View, position: Int, item: MediaLibraryItem)
     fun onLongClick(v: View, position: Int, item: MediaLibraryItem): Boolean
     fun onCtxClick(v: View, position: Int, item: MediaLibraryItem)
-    fun onUpdateFinished(adapter: RecyclerView.Adapter<*>)
+    fun onUpdateFinished(adapter: androidx.recyclerview.widget.RecyclerView.Adapter<*>)
 }
diff --git a/vlc-android/src/org/videolan/vlc/media/BrowserProvider.java b/vlc-android/src/org/videolan/vlc/media/BrowserProvider.java
index 953e4cb99..a3a6d60fa 100644
--- a/vlc-android/src/org/videolan/vlc/media/BrowserProvider.java
+++ b/vlc-android/src/org/videolan/vlc/media/BrowserProvider.java
@@ -35,8 +35,8 @@ import android.graphics.BitmapFactory;
 import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
 import android.os.IBinder;
-import android.support.annotation.NonNull;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.WorkerThread;
 import android.support.v4.media.MediaBrowserCompat;
 import android.support.v4.media.MediaDescriptionCompat;
 
diff --git a/vlc-android/src/org/videolan/vlc/media/MediaUtils.kt b/vlc-android/src/org/videolan/vlc/media/MediaUtils.kt
index 88cb9e000..8c8c27fc1 100644
--- a/vlc-android/src/org/videolan/vlc/media/MediaUtils.kt
+++ b/vlc-android/src/org/videolan/vlc/media/MediaUtils.kt
@@ -8,7 +8,7 @@ import android.os.Handler
 import android.os.Looper
 import android.provider.MediaStore
 import android.provider.OpenableColumns
-import android.support.v4.app.FragmentActivity
+import androidx.fragment.app.FragmentActivity
 import android.text.TextUtils
 import kotlinx.coroutines.experimental.*
 import kotlinx.coroutines.experimental.channels.Channel
@@ -38,15 +38,15 @@ private const val PAGE_SIZE = 1000
 object MediaUtils : CoroutineScope {
     override val coroutineContext = Dispatchers.Main.immediate
 
-    fun getSubs(activity: FragmentActivity, mediaList: List<MediaWrapper>) {
+    fun getSubs(activity: androidx.fragment.app.FragmentActivity, mediaList: List<MediaWrapper>) {
         showSubtitleDownloaderDialogFragment(activity, mediaList.map { it.uri.path })
     }
 
-    fun getSubs(activity: FragmentActivity, media: MediaWrapper) {
+    fun getSubs(activity: androidx.fragment.app.FragmentActivity, media: MediaWrapper) {
         showSubtitleDownloaderDialogFragment(activity, listOf(media.uri.path))
     }
 
-    fun showSubtitleDownloaderDialogFragment(activity: FragmentActivity, mediaPaths: List<String>) {
+    fun showSubtitleDownloaderDialogFragment(activity: androidx.fragment.app.FragmentActivity, mediaPaths: List<String>) {
         val callBack = java.lang.Runnable {
             SubtitleDownloaderDialogFragment.newInstance(mediaPaths).show(activity.supportFragmentManager, "Subtitle_downloader")
         }
diff --git a/vlc-android/src/org/videolan/vlc/media/MediaWrapperList.java b/vlc-android/src/org/videolan/vlc/media/MediaWrapperList.java
index d45a44da9..2c633bcb2 100644
--- a/vlc-android/src/org/videolan/vlc/media/MediaWrapperList.java
+++ b/vlc-android/src/org/videolan/vlc/media/MediaWrapperList.java
@@ -20,7 +20,7 @@
  *****************************************************************************/
 package org.videolan.vlc.media;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.videolan.medialibrary.Medialibrary;
 import org.videolan.medialibrary.media.MediaWrapper;
diff --git a/vlc-android/src/org/videolan/vlc/media/PlayerController.kt b/vlc-android/src/org/videolan/vlc/media/PlayerController.kt
index c5f9c2581..8b6c8ef32 100644
--- a/vlc-android/src/org/videolan/vlc/media/PlayerController.kt
+++ b/vlc-android/src/org/videolan/vlc/media/PlayerController.kt
@@ -1,9 +1,9 @@
 package org.videolan.vlc.media
 
-import android.arch.lifecycle.MutableLiveData
+import androidx.lifecycle.MutableLiveData
 import android.content.Context
 import android.net.Uri
-import android.support.annotation.MainThread
+import androidx.annotation.MainThread
 import android.support.v4.media.session.PlaybackStateCompat
 import android.widget.Toast
 import kotlinx.coroutines.experimental.*
diff --git a/vlc-android/src/org/videolan/vlc/media/PlaylistManager.kt b/vlc-android/src/org/videolan/vlc/media/PlaylistManager.kt
index 031d131be..381b6d04d 100644
--- a/vlc-android/src/org/videolan/vlc/media/PlaylistManager.kt
+++ b/vlc-android/src/org/videolan/vlc/media/PlaylistManager.kt
@@ -1,10 +1,10 @@
 package org.videolan.vlc.media
 
-import android.arch.lifecycle.MutableLiveData
+import androidx.lifecycle.MutableLiveData
 import android.content.Intent
 import android.net.Uri
-import android.support.annotation.MainThread
-import android.support.v4.content.LocalBroadcastManager
+import androidx.annotation.MainThread
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import android.support.v4.media.session.PlaybackStateCompat
 import android.text.TextUtils
 import android.util.Log
@@ -185,7 +185,7 @@ class PlaylistManager(val service: PlaybackService) : MediaWrapperList.EventList
         if (size == 0 || currentIndex < 0 || currentIndex >= size) {
             Log.w(TAG, "Warning: invalid next index, aborted !")
             //Close video player if started
-            LocalBroadcastManager.getInstance(ctx).sendBroadcast(Intent(EXIT_PLAYER))
+            androidx.localbroadcastmanager.content.LocalBroadcastManager.getInstance(ctx).sendBroadcast(Intent(EXIT_PLAYER))
             stop()
             return
         }
@@ -342,7 +342,7 @@ class PlaylistManager(val service: PlaybackService) : MediaWrapperList.EventList
         videoBackground = false
         if (player.isVideoPlaying() && !hasRenderer) {//Player is already running, just send it an intent
             player.setVideoTrackEnabled(true)
-            LocalBroadcastManager.getInstance(service).sendBroadcast(
+            androidx.localbroadcastmanager.content.LocalBroadcastManager.getInstance(service).sendBroadcast(
                     VideoPlayerActivity.getIntent(PLAY_FROM_SERVICE,
                             media, false, currentIndex))
         } else if (!player.switchToVideo) { //Start the video player
diff --git a/vlc-android/src/org/videolan/vlc/providers/BrowserProvider.kt b/vlc-android/src/org/videolan/vlc/providers/BrowserProvider.kt
index 896048f1f..5fd521c9c 100644
--- a/vlc-android/src/org/videolan/vlc/providers/BrowserProvider.kt
+++ b/vlc-android/src/org/videolan/vlc/providers/BrowserProvider.kt
@@ -20,13 +20,13 @@
 
 package org.videolan.vlc.providers
 
-import android.arch.lifecycle.MutableLiveData
+import androidx.lifecycle.MutableLiveData
 import android.content.Context
 import android.net.Uri
 import android.os.Handler
 import android.os.HandlerThread
 import android.os.Process
-import android.support.v4.util.SimpleArrayMap
+import androidx.collection.SimpleArrayMap
 import kotlinx.coroutines.experimental.*
 import kotlinx.coroutines.experimental.android.Main
 import kotlinx.coroutines.experimental.channels.Channel
@@ -52,7 +52,7 @@ abstract class BrowserProvider(val context: Context, val dataset: LiveDataset<Me
 
     protected var mediabrowser: MediaBrowser? = null
 
-    private val foldersContentMap = SimpleArrayMap<MediaLibraryItem, MutableList<MediaLibraryItem>>()
+    private val foldersContentMap = androidx.collection.SimpleArrayMap<MediaLibraryItem, MutableList<MediaLibraryItem>>()
     private lateinit var browserChannel : Channel<Media>
     protected var job : Job? = null
     private val showAll = Settings.getInstance(context).getBoolean("browser_show_all_files", true)
diff --git a/vlc-android/src/org/videolan/vlc/providers/FileBrowserProvider.kt b/vlc-android/src/org/videolan/vlc/providers/FileBrowserProvider.kt
index aaf742760..0dd4bdd4e 100644
--- a/vlc-android/src/org/videolan/vlc/providers/FileBrowserProvider.kt
+++ b/vlc-android/src/org/videolan/vlc/providers/FileBrowserProvider.kt
@@ -20,7 +20,7 @@
 
 package org.videolan.vlc.providers
 
-import android.arch.lifecycle.Observer
+import androidx.lifecycle.Observer
 import android.content.Context
 import android.hardware.usb.UsbDevice
 import android.net.Uri
diff --git a/vlc-android/src/org/videolan/vlc/providers/NetworkProvider.kt b/vlc-android/src/org/videolan/vlc/providers/NetworkProvider.kt
index f5d099fcb..cc659d4e9 100644
--- a/vlc-android/src/org/videolan/vlc/providers/NetworkProvider.kt
+++ b/vlc-android/src/org/videolan/vlc/providers/NetworkProvider.kt
@@ -20,7 +20,7 @@
 
 package org.videolan.vlc.providers
 
-import android.arch.lifecycle.Observer
+import androidx.lifecycle.Observer
 import android.content.Context
 import kotlinx.coroutines.experimental.launch
 import org.videolan.medialibrary.media.DummyItem
diff --git a/vlc-android/src/org/videolan/vlc/repository/BrowserFavRepository.kt b/vlc-android/src/org/videolan/vlc/repository/BrowserFavRepository.kt
index 09ae90de4..97f57a97c 100644
--- a/vlc-android/src/org/videolan/vlc/repository/BrowserFavRepository.kt
+++ b/vlc-android/src/org/videolan/vlc/repository/BrowserFavRepository.kt
@@ -20,10 +20,10 @@
 
 package org.videolan.vlc.repository
 
-import android.arch.lifecycle.MediatorLiveData
+import androidx.lifecycle.MediatorLiveData
 import android.content.Context
 import android.net.Uri
-import android.support.annotation.WorkerThread
+import androidx.annotation.WorkerThread
 import kotlinx.coroutines.experimental.Dispatchers
 import kotlinx.coroutines.experimental.android.Main
 import kotlinx.coroutines.experimental.launch
diff --git a/vlc-android/src/org/videolan/vlc/repository/ExternalSubRepository.kt b/vlc-android/src/org/videolan/vlc/repository/ExternalSubRepository.kt
index f7ab6b408..a6e14d7d8 100644
--- a/vlc-android/src/org/videolan/vlc/repository/ExternalSubRepository.kt
+++ b/vlc-android/src/org/videolan/vlc/repository/ExternalSubRepository.kt
@@ -20,8 +20,8 @@
 
 package org.videolan.vlc.repository
 
-import android.arch.lifecycle.LiveData
-import android.arch.lifecycle.Transformations
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.Transformations
 import android.content.Context
 import android.net.Uri
 import kotlinx.coroutines.experimental.*
diff --git a/vlc-android/src/org/videolan/vlc/util/FileUtils.java b/vlc-android/src/org/videolan/vlc/util/FileUtils.java
index 4fad43890..286b22285 100644
--- a/vlc-android/src/org/videolan/vlc/util/FileUtils.java
+++ b/vlc-android/src/org/videolan/vlc/util/FileUtils.java
@@ -37,7 +37,7 @@ import android.os.storage.StorageManager;
 import android.preference.PreferenceManager;
 import android.provider.ContactsContract;
 import android.provider.MediaStore;
-import android.support.v4.provider.DocumentFile;
+import androidx.documentfile.provider.DocumentFile;
 import android.text.TextUtils;
 import android.util.Log;
 
diff --git a/vlc-android/src/org/videolan/vlc/util/FilterDelegate.kt b/vlc-android/src/org/videolan/vlc/util/FilterDelegate.kt
index 0462d4c96..84451694c 100644
--- a/vlc-android/src/org/videolan/vlc/util/FilterDelegate.kt
+++ b/vlc-android/src/org/videolan/vlc/util/FilterDelegate.kt
@@ -1,6 +1,6 @@
 package org.videolan.vlc.util
 
-import android.arch.lifecycle.MutableLiveData
+import androidx.lifecycle.MutableLiveData
 import kotlinx.coroutines.experimental.Dispatchers
 import kotlinx.coroutines.experimental.withContext
 import org.videolan.medialibrary.media.MediaLibraryItem
diff --git a/vlc-android/src/org/videolan/vlc/util/HttpImageLoader.java b/vlc-android/src/org/videolan/vlc/util/HttpImageLoader.java
index 99b5e882d..4f94a0136 100644
--- a/vlc-android/src/org/videolan/vlc/util/HttpImageLoader.java
+++ b/vlc-android/src/org/videolan/vlc/util/HttpImageLoader.java
@@ -26,7 +26,7 @@ package org.videolan.vlc.util;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.videolan.vlc.gui.helpers.BitmapCache;
 
diff --git a/vlc-android/src/org/videolan/vlc/util/Kextensions.kt b/vlc-android/src/org/videolan/vlc/util/Kextensions.kt
index d6c85d718..e945cb129 100644
--- a/vlc-android/src/org/videolan/vlc/util/Kextensions.kt
+++ b/vlc-android/src/org/videolan/vlc/util/Kextensions.kt
@@ -1,13 +1,13 @@
 package org.videolan.vlc.util
 
-import android.arch.lifecycle.ViewModel
-import android.arch.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProviders
 import android.content.Context
 import android.content.SharedPreferences
 import android.net.ConnectivityManager
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentActivity
-import android.support.v7.preference.PreferenceManager
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.preference.PreferenceManager
 import kotlinx.coroutines.experimental.Dispatchers
 import kotlinx.coroutines.experimental.IO
 import kotlinx.coroutines.experimental.delay
@@ -44,9 +44,9 @@ fun String.validateLocation(): Boolean {
     return true
 }
 
-inline fun <reified T : ViewModel> Fragment.getModelWithActivity() = ViewModelProviders.of(requireActivity()).get(T::class.java)
-inline fun <reified T : ViewModel> Fragment.getModel() = ViewModelProviders.of(this).get(T::class.java)
-inline fun <reified T : ViewModel> FragmentActivity.getModel() = ViewModelProviders.of(this).get(T::class.java)
+inline fun <reified T : ViewModel> androidx.fragment.app.Fragment.getModelWithActivity() = ViewModelProviders.of(requireActivity()).get(T::class.java)
+inline fun <reified T : ViewModel> androidx.fragment.app.Fragment.getModel() = ViewModelProviders.of(this).get(T::class.java)
+inline fun <reified T : ViewModel> androidx.fragment.app.FragmentActivity.getModel() = ViewModelProviders.of(this).get(T::class.java)
 
 suspend fun retry (
         times: Int = 3,
diff --git a/vlc-android/src/org/videolan/vlc/util/LiveDataMap.kt b/vlc-android/src/org/videolan/vlc/util/LiveDataMap.kt
index 7be4208f5..0625e9e1d 100644
--- a/vlc-android/src/org/videolan/vlc/util/LiveDataMap.kt
+++ b/vlc-android/src/org/videolan/vlc/util/LiveDataMap.kt
@@ -1,6 +1,6 @@
 package org.videolan.vlc.util
 
-import android.arch.lifecycle.MutableLiveData
+import androidx.lifecycle.MutableLiveData
 import android.util.Log
 import org.videolan.vlc.gui.dialogs.SubtitleItem
 
diff --git a/vlc-android/src/org/videolan/vlc/util/LiveDataset.kt b/vlc-android/src/org/videolan/vlc/util/LiveDataset.kt
index 1e96dc052..a0e94c704 100644
--- a/vlc-android/src/org/videolan/vlc/util/LiveDataset.kt
+++ b/vlc-android/src/org/videolan/vlc/util/LiveDataset.kt
@@ -1,6 +1,6 @@
 package org.videolan.vlc.util
 
-import android.arch.lifecycle.MutableLiveData
+import androidx.lifecycle.MutableLiveData
 
 
 class LiveDataset<T> : MutableLiveData<MutableList<T>>() {
diff --git a/vlc-android/src/org/videolan/vlc/util/PBSMedialibraryReceiver.kt b/vlc-android/src/org/videolan/vlc/util/PBSMedialibraryReceiver.kt
index 45aff3a6d..f403930b6 100644
--- a/vlc-android/src/org/videolan/vlc/util/PBSMedialibraryReceiver.kt
+++ b/vlc-android/src/org/videolan/vlc/util/PBSMedialibraryReceiver.kt
@@ -24,7 +24,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.support.v4.content.LocalBroadcastManager
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import org.videolan.vlc.PlaybackService
 import org.videolan.vlc.VLCApplication
 import org.videolan.vlc.startMedialibrary
@@ -34,12 +34,12 @@ internal class PBSMedialibraryReceiver(private val service: PlaybackService) : B
     private val pendingActions by lazy(LazyThreadSafetyMode.NONE) { LinkedList<Runnable>() }
 
     init {
-        LocalBroadcastManager.getInstance(service).registerReceiver(this, IntentFilter(VLCApplication.ACTION_MEDIALIBRARY_READY))
+        androidx.localbroadcastmanager.content.LocalBroadcastManager.getInstance(service).registerReceiver(this, IntentFilter(VLCApplication.ACTION_MEDIALIBRARY_READY))
     }
 
     override fun onReceive(context: Context, intent: Intent) {
         service.libraryReceiver = null
-        LocalBroadcastManager.getInstance(service).unregisterReceiver(this)
+        androidx.localbroadcastmanager.content.LocalBroadcastManager.getInstance(service).unregisterReceiver(this)
         for (r in pendingActions) r.run()
     }
 
diff --git a/vlc-android/src/org/videolan/vlc/util/Permissions.java b/vlc-android/src/org/videolan/vlc/util/Permissions.java
index 4963461e4..161deef62 100644
--- a/vlc-android/src/org/videolan/vlc/util/Permissions.java
+++ b/vlc-android/src/org/videolan/vlc/util/Permissions.java
@@ -34,11 +34,11 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.fragment.app.FragmentActivity;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
 
 import org.videolan.libvlc.util.AndroidUtil;
 import org.videolan.vlc.R;
diff --git a/vlc-android/src/org/videolan/vlc/util/ThumbnailsProvider.java b/vlc-android/src/org/videolan/vlc/util/ThumbnailsProvider.java
index 97bf995d7..acbdfe516 100644
--- a/vlc-android/src/org/videolan/vlc/util/ThumbnailsProvider.java
+++ b/vlc-android/src/org/videolan/vlc/util/ThumbnailsProvider.java
@@ -6,7 +6,7 @@ import android.graphics.Canvas;
 import android.media.ThumbnailUtils;
 import android.net.Uri;
 import android.provider.MediaStore;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.WorkerThread;
 import android.text.TextUtils;
 
 import org.videolan.medialibrary.Medialibrary;
diff --git a/vlc-android/src/org/videolan/vlc/util/TvChannels.kt b/vlc-android/src/org/videolan/vlc/util/TvChannels.kt
index 7c90bcb2e..506c236e3 100644
--- a/vlc-android/src/org/videolan/vlc/util/TvChannels.kt
+++ b/vlc-android/src/org/videolan/vlc/util/TvChannels.kt
@@ -25,9 +25,9 @@ import android.content.Context
 import android.database.Cursor
 import android.net.Uri
 import android.os.Build
-import android.support.annotation.RequiresApi
-import android.support.media.tv.TvContractCompat
-import android.support.media.tv.WatchNextProgram
+import androidx.annotation.RequiresApi
+import androidx.tvprovider.media.tv.TvContractCompat
+import androidx.tvprovider.media.tv.WatchNextProgram
 import android.text.TextUtils
 import android.util.Log
 import kotlinx.coroutines.experimental.*
diff --git a/vlc-android/src/org/videolan/vlc/util/Util.java b/vlc-android/src/org/videolan/vlc/util/Util.java
index 1da9c12ec..dbbc30c0f 100644
--- a/vlc-android/src/org/videolan/vlc/util/Util.java
+++ b/vlc-android/src/org/videolan/vlc/util/Util.java
@@ -26,8 +26,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.widget.Toast;
 
diff --git a/vlc-android/src/org/videolan/vlc/util/VLCDownloadManager.kt b/vlc-android/src/org/videolan/vlc/util/VLCDownloadManager.kt
index 10b5010b7..1d0a41744 100644
--- a/vlc-android/src/org/videolan/vlc/util/VLCDownloadManager.kt
+++ b/vlc-android/src/org/videolan/vlc/util/VLCDownloadManager.kt
@@ -1,10 +1,10 @@
 package org.videolan.vlc.util
 
 import android.app.DownloadManager
-import android.arch.lifecycle.Lifecycle
-import android.arch.lifecycle.LifecycleObserver
-import android.arch.lifecycle.OnLifecycleEvent
-import android.arch.lifecycle.ProcessLifecycleOwner
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.OnLifecycleEvent
+import androidx.lifecycle.ProcessLifecycleOwner
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
diff --git a/vlc-android/src/org/videolan/vlc/util/VLCOptions.java b/vlc-android/src/org/videolan/vlc/util/VLCOptions.java
index 3482f1588..90d91e730 100644
--- a/vlc-android/src/org/videolan/vlc/util/VLCOptions.java
+++ b/vlc-android/src/org/videolan/vlc/util/VLCOptions.java
@@ -24,7 +24,7 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.media.AudioManager;
 import android.os.Build;
-import android.support.annotation.MainThread;
+import androidx.annotation.MainThread;
 import android.text.TextUtils;
 import android.util.Log;
 
diff --git a/vlc-android/src/org/videolan/vlc/viewmodels/BaseModel.kt b/vlc-android/src/org/videolan/vlc/viewmodels/BaseModel.kt
index cacb905b9..1939f10b3 100644
--- a/vlc-android/src/org/videolan/vlc/viewmodels/BaseModel.kt
+++ b/vlc-android/src/org/videolan/vlc/viewmodels/BaseModel.kt
@@ -20,7 +20,7 @@
 
 package org.videolan.vlc.viewmodels
 
-import android.arch.lifecycle.MediatorLiveData
+import androidx.lifecycle.MediatorLiveData
 import android.content.Context
 import kotlinx.coroutines.experimental.Dispatchers
 import kotlinx.coroutines.experimental.channels.Channel
diff --git a/vlc-android/src/org/videolan/vlc/viewmodels/HistoryModel.kt b/vlc-android/src/org/videolan/vlc/viewmodels/HistoryModel.kt
index 4815920f7..2c5310dd4 100644
--- a/vlc-android/src/org/videolan/vlc/viewmodels/HistoryModel.kt
+++ b/vlc-android/src/org/videolan/vlc/viewmodels/HistoryModel.kt
@@ -20,8 +20,8 @@
 
 package org.videolan.vlc.viewmodels
 
-import android.arch.lifecycle.ViewModel
-import android.arch.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
 import android.content.Context
 import kotlinx.coroutines.experimental.Dispatchers
 import kotlinx.coroutines.experimental.withContext
diff --git a/vlc-android/src/org/videolan/vlc/viewmodels/PlaylistModel.kt b/vlc-android/src/org/videolan/vlc/viewmodels/PlaylistModel.kt
index ca1f1b21d..30388a575 100644
--- a/vlc-android/src/org/videolan/vlc/viewmodels/PlaylistModel.kt
+++ b/vlc-android/src/org/videolan/vlc/viewmodels/PlaylistModel.kt
@@ -20,11 +20,11 @@
 
 package org.videolan.vlc.viewmodels
 
-import android.arch.lifecycle.MediatorLiveData
-import android.arch.lifecycle.ViewModel
-import android.arch.lifecycle.ViewModelProvider
-import android.arch.lifecycle.ViewModelProviders
-import android.support.v4.app.Fragment
+import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelProviders
+import androidx.fragment.app.Fragment
 import kotlinx.coroutines.experimental.launch
 import org.videolan.medialibrary.Tools
 import org.videolan.medialibrary.media.MediaWrapper
@@ -91,7 +91,7 @@ class PlaylistModel(private val service: PlaybackService) : ScopedModel(), Playb
     }
 
     companion object {
-        fun get(fragment: Fragment, service: PlaybackService) = ViewModelProviders.of(fragment, PlaylistModel.Factory(service)).get(PlaylistModel::class.java)
+        fun get(fragment: androidx.fragment.app.Fragment, service: PlaybackService) = ViewModelProviders.of(fragment, PlaylistModel.Factory(service)).get(PlaylistModel::class.java)
     }
 
     class Factory(val service: PlaybackService): ViewModelProvider.NewInstanceFactory() {
diff --git a/vlc-android/src/org/videolan/vlc/viewmodels/ScopedModel.kt b/vlc-android/src/org/videolan/vlc/viewmodels/ScopedModel.kt
index 31aaf2144..fc8bc8cdd 100644
--- a/vlc-android/src/org/videolan/vlc/viewmodels/ScopedModel.kt
+++ b/vlc-android/src/org/videolan/vlc/viewmodels/ScopedModel.kt
@@ -1,6 +1,6 @@
 package org.videolan.vlc.viewmodels
 
-import android.arch.lifecycle.ViewModel
+import androidx.lifecycle.ViewModel
 import android.util.Log
 import kotlinx.coroutines.experimental.CoroutineScope
 import kotlinx.coroutines.experimental.Dispatchers
diff --git a/vlc-android/src/org/videolan/vlc/viewmodels/StreamsModel.kt b/vlc-android/src/org/videolan/vlc/viewmodels/StreamsModel.kt
index d96ecb9af..6858a70b4 100644
--- a/vlc-android/src/org/videolan/vlc/viewmodels/StreamsModel.kt
+++ b/vlc-android/src/org/videolan/vlc/viewmodels/StreamsModel.kt
@@ -20,8 +20,8 @@
 
 package org.videolan.vlc.viewmodels
 
-import android.arch.lifecycle.MutableLiveData
-import android.databinding.ObservableField
+import androidx.lifecycle.MutableLiveData
+import androidx.databinding.ObservableField
 import kotlinx.coroutines.experimental.Dispatchers
 import kotlinx.coroutines.experimental.IO
 import kotlinx.coroutines.experimental.launch
diff --git a/vlc-android/src/org/videolan/vlc/viewmodels/SubtitlesModel.kt b/vlc-android/src/org/videolan/vlc/viewmodels/SubtitlesModel.kt
index 6268ac75e..cbc9f69e3 100644
--- a/vlc-android/src/org/videolan/vlc/viewmodels/SubtitlesModel.kt
+++ b/vlc-android/src/org/videolan/vlc/viewmodels/SubtitlesModel.kt
@@ -1,10 +1,10 @@
 package org.videolan.vlc.viewmodels
 
-import android.arch.lifecycle.*
+import androidx.lifecycle.*
 import android.content.Context
-import android.databinding.Observable
-import android.databinding.ObservableBoolean
-import android.databinding.ObservableField
+import androidx.databinding.Observable
+import androidx.databinding.ObservableBoolean
+import androidx.databinding.ObservableField
 import kotlinx.coroutines.experimental.*
 import org.videolan.vlc.R
 import org.videolan.vlc.api.NoConnectivityException
diff --git a/vlc-android/src/org/videolan/vlc/viewmodels/VideosModel.kt b/vlc-android/src/org/videolan/vlc/viewmodels/VideosModel.kt
index 69180834f..3750eb844 100644
--- a/vlc-android/src/org/videolan/vlc/viewmodels/VideosModel.kt
+++ b/vlc-android/src/org/videolan/vlc/viewmodels/VideosModel.kt
@@ -20,12 +20,12 @@
 
 package org.videolan.vlc.viewmodels
 
-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModel
-import android.arch.lifecycle.ViewModelProvider
-import android.arch.lifecycle.ViewModelProviders
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelProviders
 import android.content.Context
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import kotlinx.coroutines.experimental.Dispatchers
 import kotlinx.coroutines.experimental.isActive
 import kotlinx.coroutines.experimental.withContext
@@ -124,7 +124,7 @@ open class VideosModel(context: Context, private val group: String?, private val
     companion object {
         fun get(
                 context: Context,
-                fragment: Fragment,
+                fragment: androidx.fragment.app.Fragment,
                 group: String?,
                 sort : Int = Medialibrary.SORT_DEFAULT,
                 minGroupLen : Int = 0,
diff --git a/vlc-android/src/org/videolan/vlc/viewmodels/audio/AlbumModel.kt b/vlc-android/src/org/videolan/vlc/viewmodels/audio/AlbumModel.kt
index 6b182fa31..fe8b71ddd 100644
--- a/vlc-android/src/org/videolan/vlc/viewmodels/audio/AlbumModel.kt
+++ b/vlc-android/src/org/videolan/vlc/viewmodels/audio/AlbumModel.kt
@@ -20,8 +20,8 @@
 
 package org.videolan.vlc.viewmodels.audio
 
-import android.arch.lifecycle.ViewModel
-import android.arch.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
 import android.content.Context
 import kotlinx.coroutines.experimental.Dispatchers
 import kotlinx.coroutines.experimental.IO
diff --git a/vlc-android/src/org/videolan/vlc/viewmodels/audio/ArtistModel.kt b/vlc-android/src/org/videolan/vlc/viewmodels/audio/ArtistModel.kt
index 5475bf250..d7548e06b 100644
--- a/vlc-android/src/org/videolan/vlc/viewmodels/audio/ArtistModel.kt
+++ b/vlc-android/src/org/videolan/vlc/viewmodels/audio/ArtistModel.kt
@@ -20,8 +20,8 @@
 
 package org.videolan.vlc.viewmodels.audio
 
-import android.arch.lifecycle.ViewModel
-import android.arch.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
 import android.content.Context
 import kotlinx.coroutines.experimental.Dispatchers
 import kotlinx.coroutines.experimental.IO
diff --git a/vlc-android/src/org/videolan/vlc/viewmodels/audio/GenresModel.kt b/vlc-android/src/org/videolan/vlc/viewmodels/audio/GenresModel.kt
index 5aa2e2ad4..2552ce51d 100644
--- a/vlc-android/src/org/videolan/vlc/viewmodels/audio/GenresModel.kt
+++ b/vlc-android/src/org/videolan/vlc/viewmodels/audio/GenresModel.kt
@@ -20,8 +20,8 @@
 
 package org.videolan.vlc.viewmodels.audio
 
-import android.arch.lifecycle.ViewModel
-import android.arch.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
 import android.content.Context
 import kotlinx.coroutines.experimental.Dispatchers
 import kotlinx.coroutines.experimental.IO
diff --git a/vlc-android/src/org/videolan/vlc/viewmodels/audio/PlaylistsModel.kt b/vlc-android/src/org/videolan/vlc/viewmodels/audio/PlaylistsModel.kt
index 91665c28b..d6514e269 100644
--- a/vlc-android/src/org/videolan/vlc/viewmodels/audio/PlaylistsModel.kt
+++ b/vlc-android/src/org/videolan/vlc/viewmodels/audio/PlaylistsModel.kt
@@ -20,8 +20,8 @@
 
 package org.videolan.vlc.viewmodels.audio
 
-import android.arch.lifecycle.ViewModel
-import android.arch.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
 import android.content.Context
 import kotlinx.coroutines.experimental.Dispatchers
 import kotlinx.coroutines.experimental.IO
diff --git a/vlc-android/src/org/videolan/vlc/viewmodels/audio/TracksModel.kt b/vlc-android/src/org/videolan/vlc/viewmodels/audio/TracksModel.kt
index 87e7da2c7..38e414bf9 100644
--- a/vlc-android/src/org/videolan/vlc/viewmodels/audio/TracksModel.kt
+++ b/vlc-android/src/org/videolan/vlc/viewmodels/audio/TracksModel.kt
@@ -20,8 +20,8 @@
 
 package org.videolan.vlc.viewmodels.audio
 
-import android.arch.lifecycle.ViewModel
-import android.arch.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
 import android.content.Context
 import kotlinx.coroutines.experimental.Dispatchers
 import kotlinx.coroutines.experimental.IO
diff --git a/vlc-android/src/org/videolan/vlc/viewmodels/browser/BrowserModel.kt b/vlc-android/src/org/videolan/vlc/viewmodels/browser/BrowserModel.kt
index 79c0a9c12..faecdf48d 100644
--- a/vlc-android/src/org/videolan/vlc/viewmodels/browser/BrowserModel.kt
+++ b/vlc-android/src/org/videolan/vlc/viewmodels/browser/BrowserModel.kt
@@ -20,10 +20,10 @@
 
 package org.videolan.vlc.viewmodels.browser
 
-import android.arch.lifecycle.ViewModel
-import android.arch.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
 import android.content.Context
-import android.support.annotation.MainThread
+import androidx.annotation.MainThread
 import kotlinx.coroutines.experimental.Dispatchers
 import kotlinx.coroutines.experimental.launch
 import kotlinx.coroutines.experimental.withContext
diff --git a/vlc-android/src/org/videolan/vlc/viewmodels/browser/NetworkModel.kt b/vlc-android/src/org/videolan/vlc/viewmodels/browser/NetworkModel.kt
index a19e56b0d..1a677715e 100644
--- a/vlc-android/src/org/videolan/vlc/viewmodels/browser/NetworkModel.kt
+++ b/vlc-android/src/org/videolan/vlc/viewmodels/browser/NetworkModel.kt
@@ -20,8 +20,8 @@
 
 package org.videolan.vlc.viewmodels.browser
 
-import android.arch.lifecycle.ViewModel
-import android.arch.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
 import android.content.Context
 
 class NetworkModel(context: Context, url: String? = null, showHiddenFiles: Boolean): BrowserModel(context, url, TYPE_NETWORK, showHiddenFiles) {
diff --git a/vlc-android/src/org/videolan/vlc/viewmodels/paged/MLPagedModel.kt b/vlc-android/src/org/videolan/vlc/viewmodels/paged/MLPagedModel.kt
index f688be945..8fa94bead 100644
--- a/vlc-android/src/org/videolan/vlc/viewmodels/paged/MLPagedModel.kt
+++ b/vlc-android/src/org/videolan/vlc/viewmodels/paged/MLPagedModel.kt
@@ -1,10 +1,10 @@
 package org.videolan.vlc.viewmodels.paged
 
-import android.arch.lifecycle.MutableLiveData
-import android.arch.paging.DataSource
-import android.arch.paging.LivePagedListBuilder
-import android.arch.paging.PagedList
-import android.arch.paging.PositionalDataSource
+import androidx.lifecycle.MutableLiveData
+import androidx.paging.DataSource
+import androidx.paging.LivePagedListBuilder
+import androidx.paging.PagedList
+import androidx.paging.PositionalDataSource
 import android.content.Context
 import kotlinx.coroutines.experimental.launch
 import org.videolan.medialibrary.Medialibrary
diff --git a/vlc-android/src/org/videolan/vlc/viewmodels/paged/PagedAlbumsModel.kt b/vlc-android/src/org/videolan/vlc/viewmodels/paged/PagedAlbumsModel.kt
index 7000209a1..44d6c0191 100644
--- a/vlc-android/src/org/videolan/vlc/viewmodels/paged/PagedAlbumsModel.kt
+++ b/vlc-android/src/org/videolan/vlc/viewmodels/paged/PagedAlbumsModel.kt
@@ -1,7 +1,7 @@
 package org.videolan.vlc.viewmodels.paged
 
-import android.arch.lifecycle.ViewModel
-import android.arch.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
 import android.content.Context
 import org.videolan.medialibrary.Medialibrary
 import org.videolan.medialibrary.media.Album
diff --git a/vlc-android/src/org/videolan/vlc/viewmodels/paged/PagedArtistsModel.kt b/vlc-android/src/org/videolan/vlc/viewmodels/paged/PagedArtistsModel.kt
index c7e89da57..de9a07f9e 100644
--- a/vlc-android/src/org/videolan/vlc/viewmodels/paged/PagedArtistsModel.kt
+++ b/vlc-android/src/org/videolan/vlc/viewmodels/paged/PagedArtistsModel.kt
@@ -1,7 +1,7 @@
 package org.videolan.vlc.viewmodels.paged
 
-import android.arch.lifecycle.ViewModel
-import android.arch.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
 import android.content.Context
 import org.videolan.medialibrary.Medialibrary
 import org.videolan.medialibrary.media.Artist
diff --git a/vlc-android/src/org/videolan/vlc/viewmodels/paged/PagedGenresModel.kt b/vlc-android/src/org/videolan/vlc/viewmodels/paged/PagedGenresModel.kt
index 6456971f5..91f53798a 100644
--- a/vlc-android/src/org/videolan/vlc/viewmodels/paged/PagedGenresModel.kt
+++ b/vlc-android/src/org/videolan/vlc/viewmodels/paged/PagedGenresModel.kt
@@ -1,7 +1,7 @@
 package org.videolan.vlc.viewmodels.paged
 
-import android.arch.lifecycle.ViewModel
-import android.arch.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
 import android.content.Context
 import org.videolan.medialibrary.Medialibrary
 import org.videolan.medialibrary.media.Genre
diff --git a/vlc-android/src/org/videolan/vlc/viewmodels/paged/PagedPlaylistsModel.kt b/vlc-android/src/org/videolan/vlc/viewmodels/paged/PagedPlaylistsModel.kt
index 366229bb9..3eaf8aa10 100644
--- a/vlc-android/src/org/videolan/vlc/viewmodels/paged/PagedPlaylistsModel.kt
+++ b/vlc-android/src/org/videolan/vlc/viewmodels/paged/PagedPlaylistsModel.kt
@@ -1,7 +1,7 @@
 package org.videolan.vlc.viewmodels.paged
 
-import android.arch.lifecycle.ViewModel
-import android.arch.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
 import android.content.Context
 import org.videolan.medialibrary.Medialibrary
 import org.videolan.medialibrary.media.Playlist
diff --git a/vlc-android/src/org/videolan/vlc/viewmodels/paged/PagedTracksModel.kt b/vlc-android/src/org/videolan/vlc/viewmodels/paged/PagedTracksModel.kt
index 2b5896c83..f70f383b2 100644
--- a/vlc-android/src/org/videolan/vlc/viewmodels/paged/PagedTracksModel.kt
+++ b/vlc-android/src/org/videolan/vlc/viewmodels/paged/PagedTracksModel.kt
@@ -1,7 +1,7 @@
 package org.videolan.vlc.viewmodels.paged
 
-import android.arch.lifecycle.ViewModel
-import android.arch.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
 import android.content.Context
 import kotlinx.coroutines.experimental.Dispatchers
 import kotlinx.coroutines.experimental.android.Main
diff --git a/vlc-android/test-common/org/videolan/vlc/util/LiveDataTestUtil.kt b/vlc-android/test-common/org/videolan/vlc/util/LiveDataTestUtil.kt
index 1cb52d100..3945c1a4d 100644
--- a/vlc-android/test-common/org/videolan/vlc/util/LiveDataTestUtil.kt
+++ b/vlc-android/test-common/org/videolan/vlc/util/LiveDataTestUtil.kt
@@ -20,7 +20,7 @@
 
 package org.videolan.vlc.util
 
-import android.arch.lifecycle.LiveData
+import androidx.lifecycle.LiveData
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 
diff --git a/vlc-android/test/org/videolan/vlc/repository/BrowserFavRepositoryTest.kt b/vlc-android/test/org/videolan/vlc/repository/BrowserFavRepositoryTest.kt
index 431f628df..24341933d 100644
--- a/vlc-android/test/org/videolan/vlc/repository/BrowserFavRepositoryTest.kt
+++ b/vlc-android/test/org/videolan/vlc/repository/BrowserFavRepositoryTest.kt
@@ -20,8 +20,8 @@
 
 package org.videolan.vlc.repository
 
-import android.arch.core.executor.testing.InstantTaskExecutorRule
-import android.arch.lifecycle.MutableLiveData
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import androidx.lifecycle.MutableLiveData
 import android.net.Uri
 import kotlinx.coroutines.experimental.runBlocking
 import org.hamcrest.CoreMatchers.`is`
diff --git a/vlc-android/test/org/videolan/vlc/repository/DirectoryRepositoryTest.kt b/vlc-android/test/org/videolan/vlc/repository/DirectoryRepositoryTest.kt
index 5ce82effb..1bbf6570b 100644
--- a/vlc-android/test/org/videolan/vlc/repository/DirectoryRepositoryTest.kt
+++ b/vlc-android/test/org/videolan/vlc/repository/DirectoryRepositoryTest.kt
@@ -1,6 +1,6 @@
 package org.videolan.vlc.repository
 
-import android.arch.core.executor.testing.InstantTaskExecutorRule
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import kotlinx.coroutines.experimental.runBlocking
 import org.hamcrest.CoreMatchers.`is`
 import org.junit.Assert.*
diff --git a/vlc-android/test/org/videolan/vlc/repository/ExternalSubRepositoryTest.kt b/vlc-android/test/org/videolan/vlc/repository/ExternalSubRepositoryTest.kt
index b35a5c99b..485fe5520 100644
--- a/vlc-android/test/org/videolan/vlc/repository/ExternalSubRepositoryTest.kt
+++ b/vlc-android/test/org/videolan/vlc/repository/ExternalSubRepositoryTest.kt
@@ -20,8 +20,8 @@
 
 package org.videolan.vlc.repository
 
-import android.arch.core.executor.testing.InstantTaskExecutorRule
-import android.arch.lifecycle.MutableLiveData
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import androidx.lifecycle.MutableLiveData
 import android.net.Uri
 import kotlinx.coroutines.experimental.runBlocking
 import org.hamcrest.CoreMatchers.`is`
diff --git a/vlc-android/test/org/videolan/vlc/repository/SlaveRepositoryTest.kt b/vlc-android/test/org/videolan/vlc/repository/SlaveRepositoryTest.kt
index fec29d343..218f00a80 100644
--- a/vlc-android/test/org/videolan/vlc/repository/SlaveRepositoryTest.kt
+++ b/vlc-android/test/org/videolan/vlc/repository/SlaveRepositoryTest.kt
@@ -20,7 +20,7 @@
 
 package org.videolan.vlc.repository
 
-import android.arch.core.executor.testing.InstantTaskExecutorRule
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import android.net.Uri
 import kotlinx.coroutines.experimental.runBlocking
 import org.hamcrest.CoreMatchers.`is`