OmniLib: switch to androidx
Change-Id: I0a9afd1958d194ec8afb78d12c7946c53f5f2270
diff --git a/Android.mk b/Android.mk
index 19e7ab5..0706464 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,10 +6,8 @@
LOCAL_MODULE := OmniLib
LOCAL_SHARED_ANDROID_LIBRARIES := \
- android-support-annotations \
- android-support-v4 \
- android-support-v7-preference \
- android-support-v14-preference
+ androidx.core_core \
+ androidx.preference_preference
LOCAL_STATIC_JAVA_LIBRARY := legacy-android-test
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9249b88..483aa27 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,9 +17,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
package="org.omnirom.omnilib">
- <uses-sdk
- android:minSdkVersion="27" />
-
</manifest>
diff --git a/common.mk b/common.mk
index ebd6aa0..3db4468 100644
--- a/common.mk
+++ b/common.mk
@@ -15,8 +15,9 @@
ifeq ($(LOCAL_USE_AAPT2),true)
LOCAL_STATIC_ANDROID_LIBRARIES += \
- android-support-annotations \
- android-support-v4 \
+ androidx.annotation_annotation \
+ androidx.core_core \
+ androidx.preference_preference \
OmniLib
else
LOCAL_RESOURCE_DIR += $(call my-dir)/res
@@ -25,23 +26,23 @@
## Include transitive dependencies below
# Include android-support-v7-preference, if not already included
-ifeq (,$(findstring android-support-v7-preference,$(LOCAL_STATIC_JAVA_LIBRARIES)))
-LOCAL_RESOURCE_DIR += frameworks/support/v7/preference/res
-LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.preference
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-preference
+ifeq (,$(findstring androidx-preference,$(LOCAL_STATIC_JAVA_LIBRARIES)))
+LOCAL_RESOURCE_DIR += frameworks/support/x/preference/res
+LOCAL_AAPT_FLAGS += --extra-packages androidx.preference
+LOCAL_STATIC_JAVA_LIBRARIES += androidx-preference
endif
# Include android-support-v14-preference, if not already included
-ifeq (,$(findstring android-support-v14-preference,$(LOCAL_STATIC_JAVA_LIBRARIES)))
-LOCAL_RESOURCE_DIR += frameworks/support/v14/preference/res
-LOCAL_AAPT_FLAGS += --extra-packages android.support.v14.preference
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-v14-preference
+ifeq (,$(findstring androidx-preference,$(LOCAL_STATIC_JAVA_LIBRARIES)))
+LOCAL_RESOURCE_DIR += frameworks/support/x/preference/res
+LOCAL_AAPT_FLAGS += --extra-packages androidx.preference
+LOCAL_STATIC_JAVA_LIBRARIES += androidx-preference
endif
LOCAL_AAPT_FLAGS += --auto-add-overlay --extra-packages com.android.omnilib
LOCAL_STATIC_JAVA_LIBRARIES += \
- android-support-annotations \
- android-support-v4 \
+ androidx.annotation_annotation \
+ androidx.core_core \
OmniLib
endif
diff --git a/src/org/omnirom/omnilib/fragments/OmniLibPreferenceFragment.java b/src/org/omnirom/omnilib/fragments/OmniLibPreferenceFragment.java
index 52a3aca..67decb4 100644
--- a/src/org/omnirom/omnilib/fragments/OmniLibPreferenceFragment.java
+++ b/src/org/omnirom/omnilib/fragments/OmniLibPreferenceFragment.java
@@ -18,8 +18,8 @@
package org.omnirom.omnilib.fragments;
import android.app.DialogFragment;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v7.preference.Preference;
+import androidx.preference.PreferenceFragment;
+import androidx.preference.Preference;
import com.android.settingslib.CustomDialogPreference;
@@ -44,4 +44,4 @@
f.setTargetFragment(this, 0);
f.show(getFragmentManager(), "dialog_preference");
}
-}
\ No newline at end of file
+}
diff --git a/src/org/omnirom/omnilib/preference/AppSelectListPreference.java b/src/org/omnirom/omnilib/preference/AppSelectListPreference.java
index 9b3d009..428728f 100644
--- a/src/org/omnirom/omnilib/preference/AppSelectListPreference.java
+++ b/src/org/omnirom/omnilib/preference/AppSelectListPreference.java
@@ -28,8 +28,8 @@
import android.graphics.drawable.Drawable;
import android.os.Handler;
import android.os.Message;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.support.v14.preference.PreferenceDialogFragment;
+import androidx.preference.PreferenceViewHolder;
+import androidx.preference.PreferenceDialogFragment;
import android.util.AttributeSet;
import android.util.Log;
import android.view.LayoutInflater;
diff --git a/src/org/omnirom/omnilib/preference/ColorSelectPreference.java b/src/org/omnirom/omnilib/preference/ColorSelectPreference.java
index 459732c..beefab6 100644
--- a/src/org/omnirom/omnilib/preference/ColorSelectPreference.java
+++ b/src/org/omnirom/omnilib/preference/ColorSelectPreference.java
@@ -24,8 +24,8 @@
import android.content.res.TypedArray;
import android.graphics.drawable.ShapeDrawable;
import android.graphics.drawable.shapes.RectShape;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
import android.util.AttributeSet;
import android.util.TypedValue;
import android.widget.ImageView;
diff --git a/src/org/omnirom/omnilib/preference/GlobalCheckBoxPreference.java b/src/org/omnirom/omnilib/preference/GlobalCheckBoxPreference.java
index c50a25d..efa7d7e 100644
--- a/src/org/omnirom/omnilib/preference/GlobalCheckBoxPreference.java
+++ b/src/org/omnirom/omnilib/preference/GlobalCheckBoxPreference.java
@@ -17,7 +17,7 @@
package org.omnirom.omnilib.preference;
import android.content.Context;
-import android.support.v7.preference.CheckBoxPreference;
+import androidx.preference.CheckBoxPreference;
import android.provider.Settings;
import android.util.AttributeSet;
diff --git a/src/org/omnirom/omnilib/preference/GlobalSettingSwitchPreference.java b/src/org/omnirom/omnilib/preference/GlobalSettingSwitchPreference.java
index 03e1cb3..6322269 100644
--- a/src/org/omnirom/omnilib/preference/GlobalSettingSwitchPreference.java
+++ b/src/org/omnirom/omnilib/preference/GlobalSettingSwitchPreference.java
@@ -17,7 +17,7 @@
package org.omnirom.omnilib.preference;
import android.content.Context;
-import android.support.v14.preference.SwitchPreference;
+import androidx.preference.SwitchPreference;
import android.provider.Settings;
import android.util.AttributeSet;
diff --git a/src/org/omnirom/omnilib/preference/ScrollAppsViewPreference.java b/src/org/omnirom/omnilib/preference/ScrollAppsViewPreference.java
index cb1f847..d64adcc 100644
--- a/src/org/omnirom/omnilib/preference/ScrollAppsViewPreference.java
+++ b/src/org/omnirom/omnilib/preference/ScrollAppsViewPreference.java
@@ -21,8 +21,8 @@
import android.content.Context;
import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
import android.util.AttributeSet;
import android.util.Log;
import android.view.LayoutInflater;
diff --git a/src/org/omnirom/omnilib/preference/SecureCheckBoxPreference.java b/src/org/omnirom/omnilib/preference/SecureCheckBoxPreference.java
index eb0dd72..ae6d874 100644
--- a/src/org/omnirom/omnilib/preference/SecureCheckBoxPreference.java
+++ b/src/org/omnirom/omnilib/preference/SecureCheckBoxPreference.java
@@ -17,7 +17,7 @@
package org.omnirom.omnilib.preference;
import android.content.Context;
-import android.support.v7.preference.CheckBoxPreference;
+import androidx.preference.CheckBoxPreference;
import android.provider.Settings;
import android.util.AttributeSet;
diff --git a/src/org/omnirom/omnilib/preference/SecureSettingSwitchPreference.java b/src/org/omnirom/omnilib/preference/SecureSettingSwitchPreference.java
index 02cc031..62e2d35 100644
--- a/src/org/omnirom/omnilib/preference/SecureSettingSwitchPreference.java
+++ b/src/org/omnirom/omnilib/preference/SecureSettingSwitchPreference.java
@@ -17,7 +17,7 @@
package org.omnirom.omnilib.preference;
import android.content.Context;
-import android.support.v14.preference.SwitchPreference;
+import androidx.preference.SwitchPreference;
import android.util.AttributeSet;
import android.provider.Settings;
diff --git a/src/org/omnirom/omnilib/preference/SeekBarPreference.java b/src/org/omnirom/omnilib/preference/SeekBarPreference.java
index 488d31a..49b62ca 100644
--- a/src/org/omnirom/omnilib/preference/SeekBarPreference.java
+++ b/src/org/omnirom/omnilib/preference/SeekBarPreference.java
@@ -19,8 +19,8 @@
import android.content.Context;
import android.content.res.TypedArray;
import android.util.TypedValue;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
import android.util.AttributeSet;
import android.util.Log;
import android.view.LayoutInflater;
diff --git a/src/org/omnirom/omnilib/preference/SystemCheckBoxPreference.java b/src/org/omnirom/omnilib/preference/SystemCheckBoxPreference.java
index 2a6ed7e..a76a1ea 100644
--- a/src/org/omnirom/omnilib/preference/SystemCheckBoxPreference.java
+++ b/src/org/omnirom/omnilib/preference/SystemCheckBoxPreference.java
@@ -17,7 +17,7 @@
package org.omnirom.omnilib.preference;
import android.content.Context;
-import android.support.v7.preference.CheckBoxPreference;
+import androidx.preference.CheckBoxPreference;
import android.provider.Settings;
import android.util.AttributeSet;
diff --git a/src/org/omnirom/omnilib/preference/SystemSettingSwitchPreference.java b/src/org/omnirom/omnilib/preference/SystemSettingSwitchPreference.java
index 684037d..9780800 100644
--- a/src/org/omnirom/omnilib/preference/SystemSettingSwitchPreference.java
+++ b/src/org/omnirom/omnilib/preference/SystemSettingSwitchPreference.java
@@ -18,7 +18,7 @@
import android.content.Context;
import android.provider.Settings;
-import android.support.v14.preference.SwitchPreference;
+import androidx.preference.SwitchPreference;
import android.util.AttributeSet;
public class SystemSettingSwitchPreference extends SwitchPreference {