JamesDSP: migrate to androidx

Change-Id: I4c4ac03c0d81d0f348fcf894b1e2207fa207ccef

6 files changed, 21 insertions, 18 deletions

diff --git a/app/src/main/Android.mk b/app/src/main/Android.mk
index add59a6..6386aa6 100644
--- a/app/src/main/Android.mk
+++ b/app/src/main/Android.mk
@@ -5,10 +5,11 @@ LOCAL_MODULE_TAGS := optional
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
-appcompat_dir := ./prebuilts/sdk/current/support/v7/appcompat/res
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    androidx.core_core \
+    androidx.preference_preference \
+    androidx.legacy_legacy-support-v13
 
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat
 
 LOCAL_SRC_FILES := $(call all-java-files-under, java)
 
@@ -16,7 +17,6 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 LOCAL_RESOURCE_DIR += $(appcompat_dir)
 
 LOCAL_AAPT_FLAGS := --auto-add-overlay
-LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.appcompat
 
 LOCAL_PRIVATE_PLATFORM_APIS := true
 
diff --git a/app/src/main/java/james/dsp/activity/DSPManager.java b/app/src/main/java/james/dsp/activity/DSPManager.java
index 03d8aa2..f5c7cb2 100644
--- a/app/src/main/java/james/dsp/activity/DSPManager.java
+++ b/app/src/main/java/james/dsp/activity/DSPManager.java
@@ -20,13 +20,7 @@ import android.content.res.Resources;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.annotation.RequiresApi;
-import android.support.v13.app.FragmentPagerAdapter;
-import android.support.v7.app.ActionBarDrawerToggle;
 import android.util.Log;
-import android.support.v4.content.res.ResourcesCompat;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.view.ViewPager;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -37,6 +31,12 @@ import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.SimpleAdapter;
 import android.widget.TextView;
+import androidx.annotation.RequiresApi;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.core.content.res.ResourcesCompat;
+import androidx.core.view.GravityCompat;
+import androidx.legacy.app.FragmentPagerAdapter;
+import androidx.viewpager.widget.ViewPager;
 
 import james.dsp.R;
 import james.dsp.service.HeadsetService;
@@ -798,4 +798,5 @@ public final class DSPManager extends Activity
     }
 
 
-}
\ No newline at end of file
+}
+
diff --git a/app/src/main/java/james/dsp/preference/EqualizerSurface.java b/app/src/main/java/james/dsp/preference/EqualizerSurface.java
index 8b07207..53b5f11 100644
--- a/app/src/main/java/james/dsp/preference/EqualizerSurface.java
+++ b/app/src/main/java/james/dsp/preference/EqualizerSurface.java
@@ -10,11 +10,11 @@ import android.graphics.Path;
 import android.graphics.Shader;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.res.ResourcesCompat;
 import android.util.AttributeSet;
 import android.view.SurfaceView;
 import android.view.View;
+import androidx.core.content.ContextCompat;
+import androidx.core.content.res.ResourcesCompat;
 import james.dsp.R;
 import james.dsp.activity.DSPManager;
 
@@ -276,4 +276,5 @@ public class EqualizerSurface extends SurfaceView
         }
         return idx;
     }
-}
\ No newline at end of file
+}
+
diff --git a/app/src/main/java/james/dsp/receiver/BootCompletedReceiver.java b/app/src/main/java/james/dsp/receiver/BootCompletedReceiver.java
index a110290..b3b7c24 100644
--- a/app/src/main/java/james/dsp/receiver/BootCompletedReceiver.java
+++ b/app/src/main/java/james/dsp/receiver/BootCompletedReceiver.java
@@ -6,7 +6,7 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 
 import james.dsp.R;
 
diff --git a/app/src/main/java/james/dsp/service/HeadsetService.java b/app/src/main/java/james/dsp/service/HeadsetService.java
index 1143514..6f4aaa5 100644
--- a/app/src/main/java/james/dsp/service/HeadsetService.java
+++ b/app/src/main/java/james/dsp/service/HeadsetService.java
@@ -20,9 +20,9 @@ import android.media.audiofx.AudioEffect;
 import android.os.Binder;
 import android.os.Build;
 import android.os.IBinder;
-import android.support.v4.app.NotificationCompat;
 import android.util.Log;
 import android.widget.Toast;
+import androidx.core.app.NotificationCompat;
 import james.dsp.R;
 import james.dsp.activity.DSPManager;
 
@@ -874,4 +874,5 @@ class StartUpOptimiserThread implements Runnable {
 			session.setParameterShort(session.JamesDSP, 1205, (short)convolverEnabled); // Convolver switch
 		}
 	}
-}
\ No newline at end of file
+}
+
diff --git a/app/src/main/java/james/dsp/widgets/CustomDrawerLayout.java b/app/src/main/java/james/dsp/widgets/CustomDrawerLayout.java
index c59cd90..490dee9 100644
--- a/app/src/main/java/james/dsp/widgets/CustomDrawerLayout.java
+++ b/app/src/main/java/james/dsp/widgets/CustomDrawerLayout.java
@@ -1,8 +1,8 @@
 package james.dsp.widgets;
 
 import android.content.Context;
-import android.support.v4.widget.DrawerLayout;
 import android.util.AttributeSet;
+import androidx.drawerlayout.widget.DrawerLayout;
 
 public class CustomDrawerLayout extends DrawerLayout
 {