AudioFX: Migrate to androidx

Change-Id: I15f1d576a3385677b95c1520229db9ab16cc4766

16 files changed, 41 insertions, 25 deletions

diff --git a/Android.mk b/Android.mk
index ba2c9ba..f44369e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -9,7 +9,8 @@ LOCAL_MODULE_TAGS	:= optional
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_STATIC_ANDROID_LIBRARIES := \
-    android-support-v4
+    androidx.core_core \
+    androidx.legacy_legacy-support-v4
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     org.lineageos.platform.internal
diff --git a/res/layout/equalizer.xml b/res/layout/equalizer.xml
index 04270a9..e82590a 100644
--- a/res/layout/equalizer.xml
+++ b/res/layout/equalizer.xml
@@ -31,7 +31,7 @@
                 android:layout_width="match_parent"
         />
 
-        <android.support.v4.view.ViewPager
+        <androidx.viewpager.widget.ViewPager
                 android:layout_height="0dp"
                 android:layout_width="0dp"
                 android:visibility="gone"
diff --git a/src/org/lineageos/audiofx/activity/MasterConfigControl.java b/src/org/lineageos/audiofx/activity/MasterConfigControl.java
index ad64654..c620070 100644
--- a/src/org/lineageos/audiofx/activity/MasterConfigControl.java
+++ b/src/org/lineageos/audiofx/activity/MasterConfigControl.java
@@ -37,9 +37,10 @@ import android.content.SharedPreferences;
 import android.media.AudioDeviceInfo;
 import android.media.AudioManager;
 import android.os.IBinder;
-import android.support.v4.content.LocalBroadcastManager;
 import android.util.Log;
 
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
 import org.lineageos.audiofx.Constants;
 import org.lineageos.audiofx.service.AudioFxService;
 
diff --git a/src/org/lineageos/audiofx/fragment/EqualizerFragment.java b/src/org/lineageos/audiofx/fragment/EqualizerFragment.java
index d098dc1..cb97a8b 100644
--- a/src/org/lineageos/audiofx/fragment/EqualizerFragment.java
+++ b/src/org/lineageos/audiofx/fragment/EqualizerFragment.java
@@ -26,7 +26,6 @@ import android.graphics.drawable.ColorDrawable;
 import android.media.AudioDeviceInfo;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.view.ViewPager;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
@@ -37,6 +36,8 @@ import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.TextView;
 
+import androidx.viewpager.widget.ViewPager;
+
 import org.lineageos.audiofx.Preset;
 import org.lineageos.audiofx.R;
 import org.lineageos.audiofx.activity.EqualizerManager;
diff --git a/src/org/lineageos/audiofx/preset/InfinitePagerAdapter.java b/src/org/lineageos/audiofx/preset/InfinitePagerAdapter.java
index b7e8a69..eaabd02 100644
--- a/src/org/lineageos/audiofx/preset/InfinitePagerAdapter.java
+++ b/src/org/lineageos/audiofx/preset/InfinitePagerAdapter.java
@@ -16,11 +16,12 @@
 package org.lineageos.audiofx.preset;
 
 import android.os.Parcelable;
-import android.support.v4.view.PagerAdapter;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.viewpager.widget.PagerAdapter;
+
 /**
  * A PagerAdapter that wraps around another PagerAdapter to handle paging wrap-around.
  */
diff --git a/src/org/lineageos/audiofx/preset/InfiniteViewPager.java b/src/org/lineageos/audiofx/preset/InfiniteViewPager.java
index c64ca92..c51ed27 100644
--- a/src/org/lineageos/audiofx/preset/InfiniteViewPager.java
+++ b/src/org/lineageos/audiofx/preset/InfiniteViewPager.java
@@ -16,11 +16,12 @@
 package org.lineageos.audiofx.preset;
 
 import android.content.Context;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
 import org.lineageos.audiofx.R;
 import org.lineageos.audiofx.activity.EqualizerManager;
 import org.lineageos.audiofx.activity.MasterConfigControl;
diff --git a/src/org/lineageos/audiofx/preset/PresetPagerAdapter.java b/src/org/lineageos/audiofx/preset/PresetPagerAdapter.java
index 068455e..f7ad6f5 100644
--- a/src/org/lineageos/audiofx/preset/PresetPagerAdapter.java
+++ b/src/org/lineageos/audiofx/preset/PresetPagerAdapter.java
@@ -16,12 +16,13 @@
 package org.lineageos.audiofx.preset;
 
 import android.content.Context;
-import android.support.v4.view.PagerAdapter;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.viewpager.widget.PagerAdapter;
+
 import org.lineageos.audiofx.Preset;
 import org.lineageos.audiofx.R;
 import org.lineageos.audiofx.activity.EqualizerManager;
diff --git a/src/org/lineageos/audiofx/service/AudioFxService.java b/src/org/lineageos/audiofx/service/AudioFxService.java
index 00274ae..0c3aff1 100644
--- a/src/org/lineageos/audiofx/service/AudioFxService.java
+++ b/src/org/lineageos/audiofx/service/AudioFxService.java
@@ -25,9 +25,10 @@ import android.os.Binder;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.IBinder;
-import android.support.v4.content.LocalBroadcastManager;
 import android.util.Log;
 
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
 import org.lineageos.audiofx.R;
 import org.lineageos.audiofx.activity.MasterConfigControl;
 import org.lineageos.audiofx.backends.EffectSet;
diff --git a/src/org/lineageos/audiofx/viewpagerindicator/CirclePageIndicator.java b/src/org/lineageos/audiofx/viewpagerindicator/CirclePageIndicator.java
index 0354416..9d53d95 100644
--- a/src/org/lineageos/audiofx/viewpagerindicator/CirclePageIndicator.java
+++ b/src/org/lineageos/audiofx/viewpagerindicator/CirclePageIndicator.java
@@ -23,13 +23,15 @@ import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Paint.Style;
 import android.graphics.drawable.Drawable;
-import android.support.v4.view.MotionEventCompat;
-import android.support.v4.view.ViewConfigurationCompat;
-import android.support.v4.view.ViewPager;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
+
+import androidx.core.view.MotionEventCompat;
+import androidx.core.view.ViewConfigurationCompat;
+import androidx.viewpager.widget.ViewPager;
+
 import org.lineageos.audiofx.R;
 
 import static android.graphics.Paint.ANTI_ALIAS_FLAG;
diff --git a/src/org/lineageos/audiofx/viewpagerindicator/PageIndicator.java b/src/org/lineageos/audiofx/viewpagerindicator/PageIndicator.java
index 31c0451..9e9fc7b 100644
--- a/src/org/lineageos/audiofx/viewpagerindicator/PageIndicator.java
+++ b/src/org/lineageos/audiofx/viewpagerindicator/PageIndicator.java
@@ -17,7 +17,7 @@
 
 package org.lineageos.audiofx.viewpagerindicator;
 
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 
 /**
  * A PageIndicator is responsible to show an visual indicator on the total views
diff --git a/tests/Android.mk b/tests/Android.mk
index 82f0472..329ca86 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -9,12 +9,12 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_PACKAGE_NAME := AudioFXTests
 LOCAL_INSTRUMENTATION_FOR := AudioFX
 
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+    androidx.core_core
+
 LOCAL_STATIC_JAVA_LIBRARIES := \
         audiofx-android-support-test
 
-LOCAL_JAVA_LIBRARIES := \
-        android-support-v4 \
-
 LOCAL_PROGUARD_ENABLED := disabled
 
 LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 217ede2..6438aa0 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -15,6 +15,6 @@
     </application>
 
     <instrumentation
-            android:name="android.support.test.runner.AndroidJUnitRunner"
+            android:name="androidx.test.runner.AndroidJUnitRunner"
             android:targetPackage="org.lineageos.audiofx" />
 </manifest>
diff --git a/tests/README.md b/tests/README.md
index 5a6d699..44db834 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -2,4 +2,4 @@
 
 To run the tests (on a live device):
 
-  adb shell am instrument -w org.lineageos.audiofx.tests/android.support.test.runner.AndroidJUnitRunner
\ No newline at end of file
+  adb shell am instrument -w org.lineageos.audiofx.tests/androidx.test.runner.AndroidJUnitRunner
\ No newline at end of file
diff --git a/tests/src/org/lineageos/audiofx/PresetParcelTests.java b/tests/src/org/lineageos/audiofx/PresetParcelTests.java
index 8f2f52f..418015b 100644
--- a/tests/src/org/lineageos/audiofx/PresetParcelTests.java
+++ b/tests/src/org/lineageos/audiofx/PresetParcelTests.java
@@ -1,8 +1,11 @@
 package org.lineageos.audiofx;
 
 import android.os.Parcel;
-import android.support.test.runner.AndroidJUnit4;
+
+import androidx.test.runner.AndroidJUnit4;
+
 import org.lineageos.audiofx.Preset;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/src/org/lineageos/audiofx/service/AudioFxServiceTests.java b/tests/src/org/lineageos/audiofx/service/AudioFxServiceTests.java
index e7a8d3f..06410de 100644
--- a/tests/src/org/lineageos/audiofx/service/AudioFxServiceTests.java
+++ b/tests/src/org/lineageos/audiofx/service/AudioFxServiceTests.java
@@ -2,11 +2,12 @@ package org.lineageos.audiofx.service;
 
 import android.content.Intent;
 import android.media.audiofx.AudioEffect;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
 import android.test.suitebuilder.annotation.LargeTest;
-
 import android.util.Log;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
 import org.lineageos.audiofx.util.BaseAudioFxServiceInstrumentationTest;
 import org.lineageos.audiofx.util.TestMediaPlayer;
 import org.junit.After;
diff --git a/tests/src/org/lineageos/audiofx/util/BaseAudioFxServiceInstrumentationTest.java b/tests/src/org/lineageos/audiofx/util/BaseAudioFxServiceInstrumentationTest.java
index 4f9f6a2..0a10186 100644
--- a/tests/src/org/lineageos/audiofx/util/BaseAudioFxServiceInstrumentationTest.java
+++ b/tests/src/org/lineageos/audiofx/util/BaseAudioFxServiceInstrumentationTest.java
@@ -4,10 +4,13 @@ import android.content.Context;
 import android.content.Intent;
 import android.media.audiofx.AudioEffect;
 import android.os.IBinder;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.rule.ServiceTestRule;
-import android.support.test.runner.AndroidJUnit4;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.rule.ServiceTestRule;
+import androidx.test.runner.AndroidJUnit4;
+
 import org.lineageos.audiofx.service.AudioFxService;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;