From e70051d6a4331b632fd3f21d4b787379735412fb Mon Sep 17 00:00:00 2001
From: Aaron Culliney <devnull@deadc0de.org>
Date: Sun, 27 Oct 2019 17:40:01 -0700
Subject: [PATCH] Migrate to AndroidX

---
 Android/app/src/main/AndroidManifest.xml                      | 2 +-
 Android/app/src/main/java/android/widget/VerticalSeekBar.java | 2 +-
 .../main/java/org/deadc0de/apple2ix/Apple2AbstractMenu.java   | 2 +-
 .../src/main/java/org/deadc0de/apple2ix/Apple2Activity.java   | 4 ++--
 .../main/java/org/deadc0de/apple2ix/Apple2CrashHandler.java   | 2 +-
 .../java/org/deadc0de/apple2ix/Apple2DiskChooserActivity.java | 4 ++--
 .../src/main/java/org/deadc0de/apple2ix/Apple2DisksMenu.java  | 2 +-
 .../src/main/java/org/deadc0de/apple2ix/Apple2MainMenu.java   | 4 ++--
 .../main/java/org/deadc0de/apple2ix/Apple2SettingsMenu.java   | 2 +-
 .../main/java/org/deadc0de/apple2ix/Apple2SplashScreen.java   | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Android/app/src/main/AndroidManifest.xml b/Android/app/src/main/AndroidManifest.xml
index d61ce43c..b3db0001 100644
--- a/Android/app/src/main/AndroidManifest.xml
+++ b/Android/app/src/main/AndroidManifest.xml
@@ -41,7 +41,7 @@
 
         <provider
             android:authorities="${applicationId}.provider"
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
diff --git a/Android/app/src/main/java/android/widget/VerticalSeekBar.java b/Android/app/src/main/java/android/widget/VerticalSeekBar.java
index 8c7bad8e..c7aba558 100644
--- a/Android/app/src/main/java/android/widget/VerticalSeekBar.java
+++ b/Android/app/src/main/java/android/widget/VerticalSeekBar.java
@@ -10,7 +10,7 @@ package android.widget;
 
 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;
 
diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2AbstractMenu.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2AbstractMenu.java
index 8bd55aae..7ce9d7b7 100644
--- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2AbstractMenu.java
+++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2AbstractMenu.java
@@ -14,7 +14,7 @@ package org.deadc0de.apple2ix;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.graphics.drawable.Drawable;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Activity.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Activity.java
index 4711d14c..da1163c5 100644
--- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Activity.java
+++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Activity.java
@@ -19,8 +19,8 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.StrictMode;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2CrashHandler.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2CrashHandler.java
index 0acfcc84..34bdc54e 100644
--- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2CrashHandler.java
+++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2CrashHandler.java
@@ -18,7 +18,7 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.util.Log;
 import android.view.View;
 import android.widget.ProgressBar;
diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2DiskChooserActivity.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2DiskChooserActivity.java
index 0efbc98b..933f360f 100644
--- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2DiskChooserActivity.java
+++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2DiskChooserActivity.java
@@ -19,8 +19,8 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.ParcelFileDescriptor;
 import android.provider.DocumentsContract;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 
 import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2DisksMenu.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2DisksMenu.java
index e5b9dce7..c763c411 100644
--- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2DisksMenu.java
+++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2DisksMenu.java
@@ -17,7 +17,7 @@ import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2MainMenu.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2MainMenu.java
index d3070c2c..7161e02a 100644
--- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2MainMenu.java
+++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2MainMenu.java
@@ -17,8 +17,8 @@ import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.ParcelFileDescriptor;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SettingsMenu.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SettingsMenu.java
index cc8da812..a083a92b 100644
--- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SettingsMenu.java
+++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SettingsMenu.java
@@ -14,7 +14,7 @@ package org.deadc0de.apple2ix;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.util.Log;
 import android.view.View;
 import android.widget.CheckBox;
diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SplashScreen.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SplashScreen.java
index 595ea2fa..a8b5fe09 100644
--- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SplashScreen.java
+++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SplashScreen.java
@@ -13,7 +13,7 @@ package org.deadc0de.apple2ix;
 
 import android.content.Context;
 import android.content.DialogInterface;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;