migrate to androidx

37 files changed, 90 insertions, 86 deletions

diff --git a/android/sdremote/build.gradle b/android/sdremote/build.gradle
index 4f59015..19cc26a 100644
--- a/android/sdremote/build.gradle
+++ b/android/sdremote/build.gradle
@@ -3,7 +3,8 @@ buildscript {
     repositories {
         jcenter()
         maven {
-            url "https://maven.google.com"
+            url 'https://maven.google.com/'
+            name 'Google'
         }
     }
     dependencies {
@@ -35,7 +36,8 @@ allprojects {
     repositories {
         jcenter()
         maven {
-            url "https://maven.google.com"
+            url 'https://maven.google.com/'
+            name 'Google'
         }
     }
 }
diff --git a/android/sdremote/gradle.properties b/android/sdremote/gradle.properties
new file mode 100644
index 0000000..5465fec
--- /dev/null
+++ b/android/sdremote/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/android/sdremote/mobile/build.gradle b/android/sdremote/mobile/build.gradle
index 930560e..c55094d 100644
--- a/android/sdremote/mobile/build.gradle
+++ b/android/sdremote/mobile/build.gradle
@@ -18,9 +18,9 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:preference-v7:28.0.0'
-    implementation 'com.android.support:support-v4:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
+    implementation 'androidx.preference:preference:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
     fullImplementation 'com.google.android.gms:play-services-wearable:16.0.1'
     fullWearApp project(':wear')
 }
diff --git a/android/sdremote/mobile/src/full/java/org.libreoffice.impressremote/communication/CommunicationServiceWear.java b/android/sdremote/mobile/src/full/java/org.libreoffice.impressremote/communication/CommunicationServiceWear.java
index 7dff6ac..9b7545c 100644
--- a/android/sdremote/mobile/src/full/java/org.libreoffice.impressremote/communication/CommunicationServiceWear.java
+++ b/android/sdremote/mobile/src/full/java/org.libreoffice.impressremote/communication/CommunicationServiceWear.java
@@ -10,7 +10,7 @@ package org.libreoffice.impressremote.communication;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.util.Log;
 
 import com.google.android.gms.common.api.GoogleApiClient;
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputerConnectionActivity.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputerConnectionActivity.java
index 5c35ce0..21890cd 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputerConnectionActivity.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputerConnectionActivity.java
@@ -9,8 +9,8 @@
 package org.libreoffice.impressremote.activity;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.MenuItem;
 
 import org.libreoffice.impressremote.fragment.ComputerConnectionFragment;
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputerCreationActivity.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputerCreationActivity.java
index 89c8c4e..b15ed3a 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputerCreationActivity.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputerCreationActivity.java
@@ -11,10 +11,10 @@ package org.libreoffice.impressremote.activity;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.design.widget.TextInputLayout;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.app.AppCompatDelegate;
+import com.google.android.material.textfield.TextInputLayout;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
 import android.text.TextUtils;
 import android.util.Patterns;
 import android.view.KeyEvent;
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputersActivity.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputersActivity.java
index 603a45e..0082ace 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputersActivity.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputersActivity.java
@@ -13,11 +13,11 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.TabLayout;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.tabs.TabLayout;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/RequirementsActivity.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/RequirementsActivity.java
index 10eb898..2c782ef 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/RequirementsActivity.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/RequirementsActivity.java
@@ -9,7 +9,7 @@
 package org.libreoffice.impressremote.activity;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.MenuItem;
 
 import org.libreoffice.impressremote.R;
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/SettingsActivity.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/SettingsActivity.java
index d2f9417..56e75fa 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/SettingsActivity.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/SettingsActivity.java
@@ -9,8 +9,8 @@
 package org.libreoffice.impressremote.activity;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.preference.PreferenceFragmentCompat;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.preference.PreferenceFragmentCompat;
 import android.view.MenuItem;
 
 import org.libreoffice.impressremote.R;
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/SlideShowActivity.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/SlideShowActivity.java
index a02f2cb..245bf24 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/SlideShowActivity.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/SlideShowActivity.java
@@ -17,11 +17,11 @@ import android.content.ServiceConnection;
 import android.media.AudioManager;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.Menu;
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/adapter/ComputersPagerAdapter.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/adapter/ComputersPagerAdapter.java
index 187f399..f07c87a 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/adapter/ComputersPagerAdapter.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/adapter/ComputersPagerAdapter.java
@@ -9,9 +9,9 @@
 package org.libreoffice.impressremote.adapter;
 
 import android.content.Context;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
 
 import org.libreoffice.impressremote.R;
 import org.libreoffice.impressremote.fragment.ComputersFragment;
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/adapter/SlidesGridAdapter.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/adapter/SlidesGridAdapter.java
index ff6d2ed..3f27193 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/adapter/SlidesGridAdapter.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/adapter/SlidesGridAdapter.java
@@ -9,8 +9,8 @@
 package org.libreoffice.impressremote.adapter;
 
 import android.content.Context;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.widget.ImageViewCompat;
+import androidx.core.content.ContextCompat;
+import androidx.core.widget.ImageViewCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/adapter/SlidesPagerAdapter.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/adapter/SlidesPagerAdapter.java
index 1f32069..50c2df2 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/adapter/SlidesPagerAdapter.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/adapter/SlidesPagerAdapter.java
@@ -9,8 +9,8 @@
 package org.libreoffice.impressremote.adapter;
 
 import android.content.Context;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.widget.ImageViewCompat;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.core.widget.ImageViewCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/communication/BluetoothServersFinder.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/communication/BluetoothServersFinder.java
index ebc9537..9806769 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/communication/BluetoothServersFinder.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/communication/BluetoothServersFinder.java
@@ -21,7 +21,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.libreoffice.impressremote.util.Intents;
 
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/communication/CommunicationService.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/communication/CommunicationService.java
index 15fca05..2318db9 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/communication/CommunicationService.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/communication/CommunicationService.java
@@ -14,7 +14,7 @@ import android.app.Service;
 import android.content.Intent;
 import android.os.Binder;
 import android.os.IBinder;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import org.libreoffice.impressremote.util.Intents;
 
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/communication/TcpServersFinder.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/communication/TcpServersFinder.java
index 40b7553..7f238fe 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/communication/TcpServersFinder.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/communication/TcpServersFinder.java
@@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit;
 
 import android.content.Context;
 import android.content.Intent;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.text.TextUtils;
 
 import org.libreoffice.impressremote.util.Intents;
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java
index 8f3dd74..9864f50 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java
@@ -16,8 +16,8 @@ import android.content.IntentFilter;
 import android.content.ServiceConnection;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.fragment.app.Fragment;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/ComputersFragment.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/ComputersFragment.java
index 3b81205..de7e52b 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/ComputersFragment.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/ComputersFragment.java
@@ -22,9 +22,9 @@ import android.content.ServiceConnection;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.ListFragment;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.core.app.ActivityCompat;
+import androidx.fragment.app.ListFragment;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
 import android.view.ContextMenu;
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/TimerEditingDialog.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/TimerEditingDialog.java
index c77a79c..d99c3eb 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/TimerEditingDialog.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/TimerEditingDialog.java
@@ -15,8 +15,8 @@ import android.app.TimePickerDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.fragment.app.DialogFragment;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.widget.TimePicker;
 
 import org.libreoffice.impressremote.R;
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/TimerSettingDialog.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/TimerSettingDialog.java
index 519d3b6..48f4970 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/TimerSettingDialog.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/TimerSettingDialog.java
@@ -15,8 +15,8 @@ import android.app.TimePickerDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatDialogFragment;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.appcompat.app.AppCompatDialogFragment;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.widget.TimePicker;
 
 import org.libreoffice.impressremote.R;
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/slides/AbstractSlideFragment.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/slides/AbstractSlideFragment.java
index 784032a..03ce128 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/slides/AbstractSlideFragment.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/slides/AbstractSlideFragment.java
@@ -12,8 +12,8 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.fragment.app.Fragment;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import org.libreoffice.impressremote.util.Intents;
 
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/slides/EmptySlideFragment.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/slides/EmptySlideFragment.java
index 052de8e..3e8266f 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/slides/EmptySlideFragment.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/slides/EmptySlideFragment.java
@@ -9,7 +9,7 @@
 package org.libreoffice.impressremote.fragment.slides;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/slides/PointerFragment.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/slides/PointerFragment.java
index 622620c..aa81ebd 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/slides/PointerFragment.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/slides/PointerFragment.java
@@ -15,8 +15,8 @@ import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v4.view.ViewPager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.viewpager.widget.ViewPager;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/slides/SlidesGridFragment.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/slides/SlidesGridFragment.java
index f4b0f94..66b29ce 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/slides/SlidesGridFragment.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/slides/SlidesGridFragment.java
@@ -14,7 +14,7 @@ import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/slides/SlidesPagerFragment.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/slides/SlidesPagerFragment.java
index 1336d41..95457c3 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/slides/SlidesPagerFragment.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/slides/SlidesPagerFragment.java
@@ -14,9 +14,9 @@ import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.support.v4.view.GestureDetectorCompat;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
+import androidx.core.view.GestureDetectorCompat;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
 import android.text.Html;
 import android.text.TextUtils;
 import android.view.GestureDetector;
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/util/Fragments.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/util/Fragments.java
index 9db696e..74434ff 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/util/Fragments.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/util/Fragments.java
@@ -8,8 +8,8 @@
  */
 package org.libreoffice.impressremote.util;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
 
 public final class Fragments {
     private Fragments() {
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/view/PointerViewPager.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/view/PointerViewPager.java
index 2424d03..3d9e9ff 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/view/PointerViewPager.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/view/PointerViewPager.java
@@ -1,7 +1,7 @@
 package org.libreoffice.impressremote.view;
 
 import android.content.Context;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
diff --git a/android/sdremote/mobile/src/main/res/layout-land/fragment_slides_pager.xml b/android/sdremote/mobile/src/main/res/layout-land/fragment_slides_pager.xml
index e3e3c9b..7c9ce96 100644
--- a/android/sdremote/mobile/src/main/res/layout-land/fragment_slides_pager.xml
+++ b/android/sdremote/mobile/src/main/res/layout-land/fragment_slides_pager.xml
@@ -22,7 +22,7 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent">
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/pager_slides"
         android:layout_weight="2"
         android:padding="@dimen/padding_slide"
diff --git a/android/sdremote/mobile/src/main/res/layout-xlarge-land/fragment_slides_pager.xml b/android/sdremote/mobile/src/main/res/layout-xlarge-land/fragment_slides_pager.xml
index ffd97c4..4c413ec 100644
--- a/android/sdremote/mobile/src/main/res/layout-xlarge-land/fragment_slides_pager.xml
+++ b/android/sdremote/mobile/src/main/res/layout-xlarge-land/fragment_slides_pager.xml
@@ -22,7 +22,7 @@
     android:gravity="center"
     android:orientation="horizontal" >
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/pager_slides"
         android:layout_width="0dp"
         android:layout_height="match_parent"
diff --git a/android/sdremote/mobile/src/main/res/layout/action_bar_computer_creation.xml b/android/sdremote/mobile/src/main/res/layout/action_bar_computer_creation.xml
index 4d347eb..a92225d 100644
--- a/android/sdremote/mobile/src/main/res/layout/action_bar_computer_creation.xml
+++ b/android/sdremote/mobile/src/main/res/layout/action_bar_computer_creation.xml
@@ -6,7 +6,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
-<android.support.v7.widget.LinearLayoutCompat
+<androidx.appcompat.widget.LinearLayoutCompat
     xmlns:compat="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
@@ -62,4 +62,4 @@
             android:layout_height="wrap_content"/>
     </FrameLayout>
 
-</android.support.v7.widget.LinearLayoutCompat>
\ No newline at end of file
+</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/android/sdremote/mobile/src/main/res/layout/activity_computer_creation.xml b/android/sdremote/mobile/src/main/res/layout/activity_computer_creation.xml
index ab2172a..ad1fa59 100644
--- a/android/sdremote/mobile/src/main/res/layout/activity_computer_creation.xml
+++ b/android/sdremote/mobile/src/main/res/layout/activity_computer_creation.xml
@@ -6,14 +6,14 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
-<android.support.v7.widget.LinearLayoutCompat
+<androidx.appcompat.widget.LinearLayoutCompat
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="@dimen/padding_creation_layout"
     android:orientation="vertical">
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/edit_ip_address_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
@@ -26,9 +26,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
 
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
@@ -41,6 +41,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
 
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
-</android.support.v7.widget.LinearLayoutCompat>
\ No newline at end of file
+</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/android/sdremote/mobile/src/main/res/layout/activity_computers.xml b/android/sdremote/mobile/src/main/res/layout/activity_computers.xml
index 870a0f2..4d80912 100644
--- a/android/sdremote/mobile/src/main/res/layout/activity_computers.xml
+++ b/android/sdremote/mobile/src/main/res/layout/activity_computers.xml
@@ -6,18 +6,18 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:compat="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context=".activity.ComputersActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/computers_toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
@@ -25,23 +25,23 @@
             android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
             />
 
-    <android.support.design.widget.TabLayout
+    <com.google.android.material.tabs.TabLayout
         android:id="@+id/pager_computers_tabs"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         style="?actionBarTabBarStyle"
         compat:tabMode="fixed" />
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-        <android.support.v4.view.ViewPager
+        <androidx.viewpager.widget.ViewPager
             xmlns:android="http://schemas.android.com/apk/res/android"
             android:id="@+id/pager_computers"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             compat:layout_behavior="@string/appbar_scrolling_view_behavior"/>
 
-        <android.support.design.widget.FloatingActionButton
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
             xmlns:android="http://schemas.android.com/apk/res/android"
             android:id="@+id/addFab"
             android:title="@string/menu_add_computer"
@@ -52,7 +52,7 @@
             compat:srcCompat="@drawable/ic_add_black_24dp"
             android:visibility="visible"/>
 
-        <android.support.design.widget.FloatingActionButton
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
             xmlns:android="http://schemas.android.com/apk/res/android"
             android:id="@+id/btFab"
             android:layout_width="56dp"
@@ -62,4 +62,4 @@
             compat:srcCompat="@drawable/ic_bluetooth_searching_black_24dp"
             android:visibility="invisible"/>
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/android/sdremote/mobile/src/main/res/layout/fragment_slides_pager.xml b/android/sdremote/mobile/src/main/res/layout/fragment_slides_pager.xml
index 8ecb8c9..c768ba1 100644
--- a/android/sdremote/mobile/src/main/res/layout/fragment_slides_pager.xml
+++ b/android/sdremote/mobile/src/main/res/layout/fragment_slides_pager.xml
@@ -24,7 +24,7 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent">
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/pager_slides"
         android:layout_weight="4"
         android:layout_width="match_parent"
diff --git a/android/sdremote/mobile/src/main/res/xml/preferences.xml b/android/sdremote/mobile/src/main/res/xml/preferences.xml
index 4d20053..0a719e5 100644
--- a/android/sdremote/mobile/src/main/res/xml/preferences.xml
+++ b/android/sdremote/mobile/src/main/res/xml/preferences.xml
@@ -16,27 +16,27 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
-<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <android.support.v7.preference.SwitchPreferenceCompat
+    <androidx.preference.SwitchPreferenceCompat
         android:key="volume_keys_actions"
         android:defaultValue="true"
         android:title="@string/preferences_volume_keys_actions_title"
         android:summary="@string/preferences_volume_keys_actions_summary"
         android:layout="@layout/preference_item"/>
 
-    <android.support.v7.preference.SwitchPreferenceCompat
+    <androidx.preference.SwitchPreferenceCompat
         android:key="keep_screen_on"
         android:defaultValue="true"
         android:title="@string/preferences_keep_screen_on_title"
         android:summary="@string/preferences_keep_screen_on_summary"
         android:layout="@layout/preference_item"/>
 
-    <android.support.v7.preference.SwitchPreferenceCompat
+    <androidx.preference.SwitchPreferenceCompat
         android:key="quiet_mode"
         android:defaultValue="false"
         android:title="@string/preferences_quiet_mode_title"
         android:summary="@string/preferences_quiet_mode_summary"
         android:layout="@layout/preference_item"/>
 
-</android.support.v7.preference.PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/android/sdremote/wear/build.gradle b/android/sdremote/wear/build.gradle
index c521ccf..445ed23 100644
--- a/android/sdremote/wear/build.gradle
+++ b/android/sdremote/wear/build.gradle
@@ -7,7 +7,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.google.android.gms:play-services-wearable:16.0.1'
     implementation 'com.google.android.support:wearable:2.8.0'
     compileOnly 'com.google.android.wearable:wearable:2.8.0'
diff --git a/android/sdremote/wear/src/main/java/org/libreoffice/impressremote/activity/ControlActivity.java b/android/sdremote/wear/src/main/java/org/libreoffice/impressremote/activity/ControlActivity.java
index 98855b7..3598950 100644
--- a/android/sdremote/wear/src/main/java/org/libreoffice/impressremote/activity/ControlActivity.java
+++ b/android/sdremote/wear/src/main/java/org/libreoffice/impressremote/activity/ControlActivity.java
@@ -17,7 +17,7 @@ import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageButton;
diff --git a/android/sdremote/wear/src/main/java/org/libreoffice/impressremote/communication/DataLayerListenerService.java b/android/sdremote/wear/src/main/java/org/libreoffice/impressremote/communication/DataLayerListenerService.java
index 5c3046d..b6a02c5 100644
--- a/android/sdremote/wear/src/main/java/org/libreoffice/impressremote/communication/DataLayerListenerService.java
+++ b/android/sdremote/wear/src/main/java/org/libreoffice/impressremote/communication/DataLayerListenerService.java
@@ -14,9 +14,9 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationManagerCompat;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.util.Log;
 
 import com.google.android.gms.common.ConnectionResult;