diff --git a/FileManager/build.gradle b/FileManager/build.gradle
index 53e6c4e6..fcc55561 100644
--- a/FileManager/build.gradle
+++ b/FileManager/build.gradle
@@ -2,15 +2,15 @@ apply plugin: 'com.android.application'
 
 dependencies {
     implementation 'com.github.openintents:distribution:1.1.3'
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
 
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test:rules:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.2'
-    androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.3'
-    androidTestImplementation 'com.android.support:support-annotations:28.0.0'
-    implementation 'com.android.support.test.espresso:espresso-idling-resource:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test:rules:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.1'
+    androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
+    androidTestImplementation 'androidx.annotation:annotation:1.0.1'
+    implementation 'androidx.test.espresso:espresso-idling-resource:3.1.1'
 }
 
 android {
@@ -24,7 +24,7 @@ android {
         minSdkVersion min_sdk_version
         targetSdkVersion target_sdk_version
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     sourceSets {
diff --git a/FileManager/res/values/donottranslate.xml b/FileManager/res/values/donottranslate.xml
index 5aefbf1d..c9260163 100644
--- a/FileManager/res/values/donottranslate.xml
+++ b/FileManager/res/values/donottranslate.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
- * Copyright (C) 2007-2012 OpenIntents.org
+ * Copyright (C) 2007-2019 OpenIntents.org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
     <!-- ***************************
          About information
          *************************** -->
-    <string name="about_copyright">Copyright © 2008-2013 OpenIntents</string>
+    <string name="about_copyright">Copyright © 2008–2019 OpenIntents</string>
     <string name="about_website_url">http://www.openintents.org/en/filemanager</string>
     <string name="about_email">support@openintents.org</string>
 
diff --git a/FileManager/src/org/openintents/filemanager/DistributionLibraryFragmentActivity.java b/FileManager/src/org/openintents/filemanager/DistributionLibraryFragmentActivity.java
index 538d90f3..7b9a1da5 100644
--- a/FileManager/src/org/openintents/filemanager/DistributionLibraryFragmentActivity.java
+++ b/FileManager/src/org/openintents/filemanager/DistributionLibraryFragmentActivity.java
@@ -2,7 +2,7 @@
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 
diff --git a/FileManager/src/org/openintents/filemanager/FileHolderListAdapter.java b/FileManager/src/org/openintents/filemanager/FileHolderListAdapter.java
index cb554742..27aa3982 100644
--- a/FileManager/src/org/openintents/filemanager/FileHolderListAdapter.java
+++ b/FileManager/src/org/openintents/filemanager/FileHolderListAdapter.java
@@ -1,7 +1,7 @@
 package org.openintents.filemanager;
 
 import android.content.Context;
-import android.support.annotation.LayoutRes;
+import androidx.annotation.LayoutRes;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/FileManager/src/org/openintents/filemanager/FileManagerActivity.java b/FileManager/src/org/openintents/filemanager/FileManagerActivity.java
index e819b19b..2a52a467 100644
--- a/FileManager/src/org/openintents/filemanager/FileManagerActivity.java
+++ b/FileManager/src/org/openintents/filemanager/FileManagerActivity.java
@@ -23,7 +23,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuInflater;
diff --git a/FileManager/src/org/openintents/filemanager/IntentFilterActivity.java b/FileManager/src/org/openintents/filemanager/IntentFilterActivity.java
index c474397d..7387d2b4 100644
--- a/FileManager/src/org/openintents/filemanager/IntentFilterActivity.java
+++ b/FileManager/src/org/openintents/filemanager/IntentFilterActivity.java
@@ -5,7 +5,7 @@
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
 import android.view.KeyEvent;
 
 import org.openintents.filemanager.lists.FileListFragment;
diff --git a/FileManager/src/org/openintents/filemanager/PreferenceActivity.java b/FileManager/src/org/openintents/filemanager/PreferenceActivity.java
index 6bf29a0f..9828b060 100644
--- a/FileManager/src/org/openintents/filemanager/PreferenceActivity.java
+++ b/FileManager/src/org/openintents/filemanager/PreferenceActivity.java
@@ -27,7 +27,7 @@
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceManager;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
 import android.view.MenuItem;
 import android.widget.Toast;
 
diff --git a/FileManager/src/org/openintents/filemanager/bookmarks/BookmarkListActivity.java b/FileManager/src/org/openintents/filemanager/bookmarks/BookmarkListActivity.java
index c9f16a14..a0c00e79 100644
--- a/FileManager/src/org/openintents/filemanager/bookmarks/BookmarkListActivity.java
+++ b/FileManager/src/org/openintents/filemanager/bookmarks/BookmarkListActivity.java
@@ -3,7 +3,7 @@
 import android.content.Intent;
 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.openintents.filemanager.compatibility.HomeIconHelper;
diff --git a/FileManager/src/org/openintents/filemanager/bookmarks/BookmarkListAdapter.java b/FileManager/src/org/openintents/filemanager/bookmarks/BookmarkListAdapter.java
index 5064ca06..29aaae39 100644
--- a/FileManager/src/org/openintents/filemanager/bookmarks/BookmarkListAdapter.java
+++ b/FileManager/src/org/openintents/filemanager/bookmarks/BookmarkListAdapter.java
@@ -1,14 +1,13 @@
 package org.openintents.filemanager.bookmarks;
 
-import android.app.Activity;
 import android.content.Context;
 import android.database.Cursor;
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.CursorLoader;
-import android.support.v4.content.Loader;
+import androidx.fragment.app.FragmentActivity;
+import androidx.loader.app.LoaderManager;
+import androidx.core.content.ContextCompat;
+import androidx.loader.content.CursorLoader;
+import androidx.loader.content.Loader;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/FileManager/src/org/openintents/filemanager/bookmarks/BookmarkListFragment.java b/FileManager/src/org/openintents/filemanager/bookmarks/BookmarkListFragment.java
index faf632af..460c3d20 100644
--- a/FileManager/src/org/openintents/filemanager/bookmarks/BookmarkListFragment.java
+++ b/FileManager/src/org/openintents/filemanager/bookmarks/BookmarkListFragment.java
@@ -2,8 +2,8 @@
 
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.ListFragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.ListFragment;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.MenuInflater;
diff --git a/FileManager/src/org/openintents/filemanager/dialogs/CreateDirectoryDialog.java b/FileManager/src/org/openintents/filemanager/dialogs/CreateDirectoryDialog.java
index 6dc7cfef..6e99cc61 100644
--- a/FileManager/src/org/openintents/filemanager/dialogs/CreateDirectoryDialog.java
+++ b/FileManager/src/org/openintents/filemanager/dialogs/CreateDirectoryDialog.java
@@ -5,7 +5,7 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.inputmethod.EditorInfo;
diff --git a/FileManager/src/org/openintents/filemanager/dialogs/DetailsDialog.java b/FileManager/src/org/openintents/filemanager/dialogs/DetailsDialog.java
index 01a4d215..b589e157 100644
--- a/FileManager/src/org/openintents/filemanager/dialogs/DetailsDialog.java
+++ b/FileManager/src/org/openintents/filemanager/dialogs/DetailsDialog.java
@@ -5,7 +5,7 @@
 import android.content.DialogInterface;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
diff --git a/FileManager/src/org/openintents/filemanager/dialogs/MultiCompressDialog.java b/FileManager/src/org/openintents/filemanager/dialogs/MultiCompressDialog.java
index f33a51e7..1f458ad2 100644
--- a/FileManager/src/org/openintents/filemanager/dialogs/MultiCompressDialog.java
+++ b/FileManager/src/org/openintents/filemanager/dialogs/MultiCompressDialog.java
@@ -4,7 +4,7 @@
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.inputmethod.EditorInfo;
diff --git a/FileManager/src/org/openintents/filemanager/dialogs/MultiDeleteDialog.java b/FileManager/src/org/openintents/filemanager/dialogs/MultiDeleteDialog.java
index 148f4fba..4db10e2e 100644
--- a/FileManager/src/org/openintents/filemanager/dialogs/MultiDeleteDialog.java
+++ b/FileManager/src/org/openintents/filemanager/dialogs/MultiDeleteDialog.java
@@ -7,7 +7,7 @@
 import android.content.DialogInterface;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.widget.Toast;
 
 import org.openintents.filemanager.R;
diff --git a/FileManager/src/org/openintents/filemanager/dialogs/OverwriteFileDialog.java b/FileManager/src/org/openintents/filemanager/dialogs/OverwriteFileDialog.java
index ac28f5e7..bed58d1a 100644
--- a/FileManager/src/org/openintents/filemanager/dialogs/OverwriteFileDialog.java
+++ b/FileManager/src/org/openintents/filemanager/dialogs/OverwriteFileDialog.java
@@ -4,7 +4,7 @@
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 
 import org.openintents.filemanager.R;
 import org.openintents.filemanager.util.UIUtils;
diff --git a/FileManager/src/org/openintents/filemanager/dialogs/RenameDialog.java b/FileManager/src/org/openintents/filemanager/dialogs/RenameDialog.java
index 2e61b79c..387d1bfe 100644
--- a/FileManager/src/org/openintents/filemanager/dialogs/RenameDialog.java
+++ b/FileManager/src/org/openintents/filemanager/dialogs/RenameDialog.java
@@ -4,7 +4,7 @@
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.inputmethod.EditorInfo;
diff --git a/FileManager/src/org/openintents/filemanager/dialogs/SingleCompressDialog.java b/FileManager/src/org/openintents/filemanager/dialogs/SingleCompressDialog.java
index d9f8cc4c..c49c92c2 100644
--- a/FileManager/src/org/openintents/filemanager/dialogs/SingleCompressDialog.java
+++ b/FileManager/src/org/openintents/filemanager/dialogs/SingleCompressDialog.java
@@ -4,7 +4,7 @@
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.inputmethod.EditorInfo;
diff --git a/FileManager/src/org/openintents/filemanager/dialogs/SingleDeleteDialog.java b/FileManager/src/org/openintents/filemanager/dialogs/SingleDeleteDialog.java
index 709c1307..2be062d6 100644
--- a/FileManager/src/org/openintents/filemanager/dialogs/SingleDeleteDialog.java
+++ b/FileManager/src/org/openintents/filemanager/dialogs/SingleDeleteDialog.java
@@ -6,7 +6,7 @@
 import android.content.DialogInterface;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.widget.Toast;
 
 import org.openintents.filemanager.R;
diff --git a/FileManager/src/org/openintents/filemanager/lists/FileListFragment.java b/FileManager/src/org/openintents/filemanager/lists/FileListFragment.java
index 33c57673..ddfee95f 100644
--- a/FileManager/src/org/openintents/filemanager/lists/FileListFragment.java
+++ b/FileManager/src/org/openintents/filemanager/lists/FileListFragment.java
@@ -6,10 +6,10 @@
 import android.os.Handler;
 import android.os.Message;
 import android.preference.PreferenceManager;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.test.espresso.IdlingResource;
-import android.support.v4.app.ListFragment;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.test.espresso.IdlingResource;
+import androidx.fragment.app.ListFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -34,7 +34,7 @@
 
 import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
 import static android.content.pm.PackageManager.PERMISSION_GRANTED;
-import static android.support.v4.content.ContextCompat.checkSelfPermission;
+import static androidx.core.content.ContextCompat.checkSelfPermission;
 
 
 /**
diff --git a/FileManager/src/org/openintents/filemanager/lists/MultiselectListFragment.java b/FileManager/src/org/openintents/filemanager/lists/MultiselectListFragment.java
index 569c30bd..f424d1fb 100644
--- a/FileManager/src/org/openintents/filemanager/lists/MultiselectListFragment.java
+++ b/FileManager/src/org/openintents/filemanager/lists/MultiselectListFragment.java
@@ -1,7 +1,7 @@
 package org.openintents.filemanager.lists;
 
 import android.os.Bundle;
-import android.support.annotation.LayoutRes;
+import androidx.annotation.LayoutRes;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
diff --git a/FileManager/src/org/openintents/filemanager/search/SearchService.java b/FileManager/src/org/openintents/filemanager/search/SearchService.java
index dbbd4ab8..b76d1014 100644
--- a/FileManager/src/org/openintents/filemanager/search/SearchService.java
+++ b/FileManager/src/org/openintents/filemanager/search/SearchService.java
@@ -2,7 +2,7 @@
 
 import android.app.IntentService;
 import android.content.Intent;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import org.openintents.intents.FileManagerIntents;
 
diff --git a/FileManager/src/org/openintents/filemanager/search/SearchableActivity.java b/FileManager/src/org/openintents/filemanager/search/SearchableActivity.java
index 7722cc3c..4d3fc72d 100644
--- a/FileManager/src/org/openintents/filemanager/search/SearchableActivity.java
+++ b/FileManager/src/org/openintents/filemanager/search/SearchableActivity.java
@@ -12,7 +12,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.SearchRecentSuggestions;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.Window;
diff --git a/FileManager/src/org/openintents/filemanager/util/CompressManager.java b/FileManager/src/org/openintents/filemanager/util/CompressManager.java
index 06cb5ede..8854c97f 100644
--- a/FileManager/src/org/openintents/filemanager/util/CompressManager.java
+++ b/FileManager/src/org/openintents/filemanager/util/CompressManager.java
@@ -26,7 +26,7 @@ public class CompressManager {
     /**
      * TAG for log messages.
      */
-    static final String TAG = "CompressManager";
+    private static final String TAG = "CompressManager";
 
     private static final int BUFFER_SIZE = 1024;
     private Context mContext;
@@ -84,7 +84,6 @@ private class CompressTask extends
         /**
          * Recursively compress file or directory
          *
-         * @returns 0 if successful, error value otherwise.
          */
         private void compressFile(File file, String path) throws IOException {
             progressDialog.setOnDismissListener(new OnDismissListener() {
diff --git a/FileManager/src/org/openintents/filemanager/util/MenuUtils.java b/FileManager/src/org/openintents/filemanager/util/MenuUtils.java
index 9c51b7f8..7f1902bd 100644
--- a/FileManager/src/org/openintents/filemanager/util/MenuUtils.java
+++ b/FileManager/src/org/openintents/filemanager/util/MenuUtils.java
@@ -15,7 +15,7 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
 import android.view.Menu;
diff --git a/FileManager/template of local.properties b/FileManager/template of local.properties
deleted file mode 100644
index 3e3caeab..00000000
--- a/FileManager/template of local.properties	
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must *NOT* be checked in Version Control Systems,
-# as it contains information specific to your local configuration.
-# location of the SDK. This is only used by Ant
-# For customization when using a Version Control System, please read the
-# header note.
-sdk.dir=C:\\android\\android-sdk-windows
diff --git a/FileManager/tests/java/org/openintents/filemanager/test/ActivityResultTestRule.java b/FileManager/tests/java/org/openintents/filemanager/test/ActivityResultTestRule.java
index 47ab121c..f28599d5 100644
--- a/FileManager/tests/java/org/openintents/filemanager/test/ActivityResultTestRule.java
+++ b/FileManager/tests/java/org/openintents/filemanager/test/ActivityResultTestRule.java
@@ -4,8 +4,8 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.test.rule.ActivityTestRule;
+import androidx.annotation.NonNull;
+import androidx.test.rule.ActivityTestRule;
 
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
diff --git a/FileManager/tests/java/org/openintents/filemanager/test/BaseTestFileManager.java b/FileManager/tests/java/org/openintents/filemanager/test/BaseTestFileManager.java
index 690c419c..b3825d37 100644
--- a/FileManager/tests/java/org/openintents/filemanager/test/BaseTestFileManager.java
+++ b/FileManager/tests/java/org/openintents/filemanager/test/BaseTestFileManager.java
@@ -1,7 +1,7 @@
 package org.openintents.filemanager.test;
 
-import android.support.test.espresso.ViewAssertion;
-import android.support.test.espresso.matcher.BoundedMatcher;
+import androidx.test.espresso.ViewAssertion;
+import androidx.test.espresso.matcher.BoundedMatcher;
 import android.view.View;
 import android.widget.Adapter;
 import android.widget.AdapterView;
@@ -17,10 +17,10 @@
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 
-import static android.support.test.espresso.Espresso.onData;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.action.ViewActions.longClick;
-import static android.support.test.espresso.action.ViewActions.pressBack;
+import static androidx.test.espresso.Espresso.onData;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.action.ViewActions.longClick;
+import static androidx.test.espresso.action.ViewActions.pressBack;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
diff --git a/FileManager/tests/java/org/openintents/filemanager/test/DirectoryScannerIdlingResource.java b/FileManager/tests/java/org/openintents/filemanager/test/DirectoryScannerIdlingResource.java
index 37f7211a..8e53c837 100644
--- a/FileManager/tests/java/org/openintents/filemanager/test/DirectoryScannerIdlingResource.java
+++ b/FileManager/tests/java/org/openintents/filemanager/test/DirectoryScannerIdlingResource.java
@@ -1,6 +1,6 @@
 package org.openintents.filemanager.test;
 
-import android.support.test.espresso.IdlingResource;
+import androidx.test.espresso.IdlingResource;
 
 import org.openintents.filemanager.FileManagerActivity;
 import org.openintents.filemanager.IntentFilterActivity;
diff --git a/FileManager/tests/java/org/openintents/filemanager/test/TestActivityTestRule.java b/FileManager/tests/java/org/openintents/filemanager/test/TestActivityTestRule.java
index c0d81944..eae9c7fa 100644
--- a/FileManager/tests/java/org/openintents/filemanager/test/TestActivityTestRule.java
+++ b/FileManager/tests/java/org/openintents/filemanager/test/TestActivityTestRule.java
@@ -19,16 +19,16 @@
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.content.Intent;
-import android.support.annotation.Nullable;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.annotation.Beta;
-import android.support.test.rule.UiThreadTestRule;
+import androidx.annotation.Nullable;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.annotation.Beta;
+import androidx.test.rule.UiThreadTestRule;
 import android.util.Log;
 
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 
-import static android.support.test.internal.util.Checks.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 /**
  * This rule provides functional testing of a single activity. The activity under test will be
diff --git a/FileManager/tests/java/org/openintents/filemanager/test/TestFileManagerActivity.java b/FileManager/tests/java/org/openintents/filemanager/test/TestFileManagerActivity.java
index 9bd749f7..89e72111 100644
--- a/FileManager/tests/java/org/openintents/filemanager/test/TestFileManagerActivity.java
+++ b/FileManager/tests/java/org/openintents/filemanager/test/TestFileManagerActivity.java
@@ -17,10 +17,10 @@
 import android.content.SharedPreferences;
 import android.os.Environment;
 import android.preference.PreferenceManager;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.espresso.Espresso;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.espresso.Espresso;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
 import android.text.format.Formatter;
 import android.view.KeyEvent;
 import android.view.View;
@@ -46,21 +46,21 @@
 import java.io.IOException;
 import java.util.Random;
 
-import static android.support.test.espresso.Espresso.onData;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu;
-import static android.support.test.espresso.Espresso.openContextualActionModeOverflowMenu;
-import static android.support.test.espresso.Espresso.pressBack;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.action.ViewActions.longClick;
-import static android.support.test.espresso.action.ViewActions.pressKey;
-import static android.support.test.espresso.action.ViewActions.replaceText;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.assertThat;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withContentDescription;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static androidx.test.espresso.Espresso.onData;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu;
+import static androidx.test.espresso.Espresso.openContextualActionModeOverflowMenu;
+import static androidx.test.espresso.Espresso.pressBack;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.action.ViewActions.longClick;
+import static androidx.test.espresso.action.ViewActions.pressKey;
+import static androidx.test.espresso.action.ViewActions.replaceText;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.assertThat;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
diff --git a/FileManager/tests/java/org/openintents/filemanager/test/TestFileManagerActivityWithIntents.java b/FileManager/tests/java/org/openintents/filemanager/test/TestFileManagerActivityWithIntents.java
index 170abe66..7a36a0dd 100644
--- a/FileManager/tests/java/org/openintents/filemanager/test/TestFileManagerActivityWithIntents.java
+++ b/FileManager/tests/java/org/openintents/filemanager/test/TestFileManagerActivityWithIntents.java
@@ -3,8 +3,8 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Environment;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.BeforeClass;
 import org.junit.Rule;
@@ -14,8 +14,8 @@
 
 import java.io.IOException;
 
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
 
 @RunWith(AndroidJUnit4.class)
 public class TestFileManagerActivityWithIntents extends BaseTestFileManager {
diff --git a/FileManager/tests/java/org/openintents/filemanager/test/TestIntentFilterActivityForPickFile.java b/FileManager/tests/java/org/openintents/filemanager/test/TestIntentFilterActivityForPickFile.java
index 7ec95a9d..1e0b5b37 100644
--- a/FileManager/tests/java/org/openintents/filemanager/test/TestIntentFilterActivityForPickFile.java
+++ b/FileManager/tests/java/org/openintents/filemanager/test/TestIntentFilterActivityForPickFile.java
@@ -3,8 +3,8 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Environment;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.BeforeClass;
 import org.junit.Rule;
@@ -15,8 +15,8 @@
 
 import java.io.IOException;
 
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
 
 @RunWith(AndroidJUnit4.class)
 public class TestIntentFilterActivityForPickFile extends BaseTestFileManager {
diff --git a/FileManager/tests/java/org/openintents/filemanager/test/TestPickFilePathHistory.java b/FileManager/tests/java/org/openintents/filemanager/test/TestPickFilePathHistory.java
index f8197716..96a2a04b 100644
--- a/FileManager/tests/java/org/openintents/filemanager/test/TestPickFilePathHistory.java
+++ b/FileManager/tests/java/org/openintents/filemanager/test/TestPickFilePathHistory.java
@@ -3,11 +3,11 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Environment;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.espresso.Espresso;
-import android.support.test.espresso.matcher.BoundedMatcher;
-import android.support.test.rule.UiThreadTestRule;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.espresso.Espresso;
+import androidx.test.espresso.matcher.BoundedMatcher;
+import androidx.test.rule.UiThreadTestRule;
+import androidx.test.runner.AndroidJUnit4;
 import android.view.View;
 
 import org.hamcrest.Description;
@@ -24,12 +24,12 @@
 import java.io.File;
 import java.io.IOException;
 
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static org.hamcrest.Matchers.endsWith;
 
 @RunWith(AndroidJUnit4.class)
diff --git a/FileManager/tests/java/org/openintents/filemanager/test/TestPickFileResult.java b/FileManager/tests/java/org/openintents/filemanager/test/TestPickFileResult.java
index 264cc4bd..2c42c76c 100644
--- a/FileManager/tests/java/org/openintents/filemanager/test/TestPickFileResult.java
+++ b/FileManager/tests/java/org/openintents/filemanager/test/TestPickFileResult.java
@@ -4,7 +4,7 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Environment;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.BeforeClass;
 import org.junit.Rule;
@@ -15,10 +15,10 @@
 
 import java.io.IOException;
 
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.intent.matcher.IntentMatchers.hasData;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.intent.matcher.IntentMatchers.hasData;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static org.junit.Assert.assertThat;
 import static org.openintents.filemanager.test.ActivityResultTestRule.hasResultCode;
 import static org.openintents.filemanager.test.ActivityResultTestRule.hasResultData;
diff --git a/FileManager/tests/java/org/openintents/filemanager/test/TestSaveAsActivity.java b/FileManager/tests/java/org/openintents/filemanager/test/TestSaveAsActivity.java
index 78838412..b2dde90c 100644
--- a/FileManager/tests/java/org/openintents/filemanager/test/TestSaveAsActivity.java
+++ b/FileManager/tests/java/org/openintents/filemanager/test/TestSaveAsActivity.java
@@ -5,11 +5,11 @@
 import android.net.Uri;
 import android.os.Environment;
 import android.os.SystemClock;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.espresso.InjectEventSecurityException;
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
-import android.support.test.rule.ActivityTestRule;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.espresso.InjectEventSecurityException;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
+import androidx.test.rule.ActivityTestRule;
 import android.view.KeyEvent;
 import android.view.View;
 
@@ -23,12 +23,12 @@
 import java.io.File;
 import java.io.IOException;
 
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.actionWithAssertions;
-import static android.support.test.espresso.action.ViewActions.closeSoftKeyboard;
-import static android.support.test.espresso.action.ViewActions.replaceText;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withHint;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.actionWithAssertions;
+import static androidx.test.espresso.action.ViewActions.closeSoftKeyboard;
+import static androidx.test.espresso.action.ViewActions.replaceText;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withHint;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
diff --git a/FileManager/tests/java/org/openintents/filemanager/test/TestViewFolderIntent.java b/FileManager/tests/java/org/openintents/filemanager/test/TestViewFolderIntent.java
index 9e405f14..1f0fc4bd 100644
--- a/FileManager/tests/java/org/openintents/filemanager/test/TestViewFolderIntent.java
+++ b/FileManager/tests/java/org/openintents/filemanager/test/TestViewFolderIntent.java
@@ -4,8 +4,8 @@
 import android.net.Uri;
 import android.os.Environment;
 import android.provider.DocumentsContract;
-import android.support.test.espresso.intent.rule.IntentsTestRule;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.espresso.intent.rule.IntentsTestRule;
+import androidx.test.runner.AndroidJUnit4;
 import android.view.View;
 
 import org.hamcrest.BaseMatcher;
@@ -17,9 +17,9 @@
 import org.openintents.filemanager.FileManagerActivity;
 import org.openintents.filemanager.view.PathBar;
 
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
 
 @RunWith(AndroidJUnit4.class)
 public class TestViewFolderIntent {
diff --git a/FileManagerDemo/build.gradle b/FileManagerDemo/build.gradle
index 6cf5c188..0fea8026 100644
--- a/FileManagerDemo/build.gradle
+++ b/FileManagerDemo/build.gradle
@@ -15,7 +15,7 @@ android {
         minSdkVersion min_sdk_version
         targetSdkVersion target_sdk_version
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     sourceSets {
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 00000000..5465fec0
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file