zenfone6: DeviceParts: switch to androidx
Change-Id: I8b28d7bd872ba312604dac7df3971f8e31d3b85c
diff --git a/DeviceParts/Android.mk b/DeviceParts/Android.mk
index 0ded8a4..b933a40 100644
--- a/DeviceParts/Android.mk
+++ b/DeviceParts/Android.mk
@@ -4,18 +4,14 @@
LOCAL_MODULE_TAGS := optional
LOCAL_STATIC_ANDROID_LIBRARIES := \
- android-support-v14-preference \
- android-support-v13 \
- android-support-v7-appcompat \
- android-support-v7-preference \
- android-support-v7-recyclerview \
- android-support-v4
+ androidx.core_core \
+ androidx.preference_preference
+
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := DeviceParts
LOCAL_CERTIFICATE := platform
LOCAL_PRIVILEGED_MODULE := true
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-LOCAL_SDK_VERSION := 29
LOCAL_USE_AAPT2 := true
package_resource_overlays := $(strip \
diff --git a/DeviceParts/AndroidManifest.xml b/DeviceParts/AndroidManifest.xml
index 7aa564f..06ef186 100644
--- a/DeviceParts/AndroidManifest.xml
+++ b/DeviceParts/AndroidManifest.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
package="org.omnirom.device"
android:sharedUserId="android.uid.system" >
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -17,6 +18,8 @@
android:icon="@drawable/ic_launcher"
android:label="@string/advanced_settings"
android:theme="@style/AppTheme"
+ android:appComponentFactory="androidx.core.app.CoreComponentFactory"
+ tools:replace="android:appComponentFactory"
android:supportsRtl="true" >
<activity
android:name="org.omnirom.device.DeviceSettingsActivity"
diff --git a/DeviceParts/src/org/omnirom/device/AppSelectListPreference.java b/DeviceParts/src/org/omnirom/device/AppSelectListPreference.java
index 984afa8..6d022e8 100644
--- a/DeviceParts/src/org/omnirom/device/AppSelectListPreference.java
+++ b/DeviceParts/src/org/omnirom/device/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/DeviceParts/src/org/omnirom/device/DeviceSettings.java b/DeviceParts/src/org/omnirom/device/DeviceSettings.java
index 771904b..1e4b4f8 100644
--- a/DeviceParts/src/org/omnirom/device/DeviceSettings.java
+++ b/DeviceParts/src/org/omnirom/device/DeviceSettings.java
@@ -22,12 +22,12 @@
import android.content.res.Resources;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceScreen;
-import android.support.v7.preference.TwoStatePreference;
+import androidx.preference.PreferenceFragment;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
import android.provider.Settings;
import android.text.TextUtils;
import android.view.MenuItem;
diff --git a/DeviceParts/src/org/omnirom/device/DeviceSettingsActivity.java b/DeviceParts/src/org/omnirom/device/DeviceSettingsActivity.java
index b3ab2ff..0370685 100644
--- a/DeviceParts/src/org/omnirom/device/DeviceSettingsActivity.java
+++ b/DeviceParts/src/org/omnirom/device/DeviceSettingsActivity.java
@@ -24,8 +24,8 @@
import android.app.Fragment;
import android.content.DialogInterface;
import android.os.Bundle;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v7.preference.PreferenceManager;
+import androidx.preference.PreferenceFragment;
+import androidx.preference.PreferenceManager;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
diff --git a/DeviceParts/src/org/omnirom/device/DozeSettings.java b/DeviceParts/src/org/omnirom/device/DozeSettings.java
index 4721e85..9e05709 100644
--- a/DeviceParts/src/org/omnirom/device/DozeSettings.java
+++ b/DeviceParts/src/org/omnirom/device/DozeSettings.java
@@ -22,12 +22,12 @@
import android.content.res.Resources;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceScreen;
-import android.support.v7.preference.TwoStatePreference;
+import androidx.preference.PreferenceFragment;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
import android.provider.Settings;
import android.text.TextUtils;
import android.view.MenuItem;
diff --git a/DeviceParts/src/org/omnirom/device/DozeSettingsActivity.java b/DeviceParts/src/org/omnirom/device/DozeSettingsActivity.java
index dae6ce8..eed2e24 100644
--- a/DeviceParts/src/org/omnirom/device/DozeSettingsActivity.java
+++ b/DeviceParts/src/org/omnirom/device/DozeSettingsActivity.java
@@ -24,8 +24,8 @@
import android.app.Fragment;
import android.content.DialogInterface;
import android.os.Bundle;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v7.preference.PreferenceManager;
+import androidx.preference.PreferenceFragment;
+import androidx.preference.PreferenceManager;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
diff --git a/DeviceParts/src/org/omnirom/device/GestureSettings.java b/DeviceParts/src/org/omnirom/device/GestureSettings.java
index 64cd037..219d7c9 100644
--- a/DeviceParts/src/org/omnirom/device/GestureSettings.java
+++ b/DeviceParts/src/org/omnirom/device/GestureSettings.java
@@ -29,12 +29,12 @@
import android.content.res.Resources;
import android.os.AsyncTask;
import android.os.Bundle;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceScreen;
-import android.support.v7.preference.TwoStatePreference;
+import androidx.preference.PreferenceFragment;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
import android.provider.Settings;
import android.text.TextUtils;
import android.view.MenuItem;
diff --git a/DeviceParts/src/org/omnirom/device/GestureSettingsActivity.java b/DeviceParts/src/org/omnirom/device/GestureSettingsActivity.java
index 7d744ad..d0a9917 100644
--- a/DeviceParts/src/org/omnirom/device/GestureSettingsActivity.java
+++ b/DeviceParts/src/org/omnirom/device/GestureSettingsActivity.java
@@ -24,9 +24,9 @@
import android.app.Fragment;
import android.content.DialogInterface;
import android.os.Bundle;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceManager;
+import androidx.preference.PreferenceFragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
diff --git a/DeviceParts/src/org/omnirom/device/GloveModeSwitch.java b/DeviceParts/src/org/omnirom/device/GloveModeSwitch.java
index 0fb4950..a2a73fb 100644
--- a/DeviceParts/src/org/omnirom/device/GloveModeSwitch.java
+++ b/DeviceParts/src/org/omnirom/device/GloveModeSwitch.java
@@ -20,9 +20,9 @@
import android.content.Context;
import android.content.SharedPreferences;
import android.provider.Settings;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.Preference.OnPreferenceChangeListener;
-import android.support.v7.preference.PreferenceManager;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.PreferenceManager;
import org.omnirom.device.DeviceSettings;
diff --git a/DeviceParts/src/org/omnirom/device/GloveModeTileService.java b/DeviceParts/src/org/omnirom/device/GloveModeTileService.java
index 85e79f7..971758d 100644
--- a/DeviceParts/src/org/omnirom/device/GloveModeTileService.java
+++ b/DeviceParts/src/org/omnirom/device/GloveModeTileService.java
@@ -21,7 +21,7 @@
import android.content.Intent;
import android.content.SharedPreferences;
import android.service.quicksettings.TileService;
-import android.support.v7.preference.PreferenceManager;
+import androidx.preference.PreferenceManager;
@TargetApi(24)
diff --git a/DeviceParts/src/org/omnirom/device/Startup.java b/DeviceParts/src/org/omnirom/device/Startup.java
index 11a5ade..5ae88d3 100644
--- a/DeviceParts/src/org/omnirom/device/Startup.java
+++ b/DeviceParts/src/org/omnirom/device/Startup.java
@@ -21,7 +21,7 @@
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
-import android.support.v7.preference.PreferenceManager;
+import androidx.preference.PreferenceManager;
import android.provider.Settings;
import android.text.TextUtils;
diff --git a/device.mk b/device.mk
index d313e3f..ffb180a 100755
--- a/device.mk
+++ b/device.mk
@@ -84,7 +84,7 @@
# DeviceParts
PRODUCT_PACKAGES += \
- #DeviceParts \
+ DeviceParts \
OmniDisplayManager
# Display