samsung: Doze: Migrate to androidx

Change-Id: Ifaa67283a3437549a2304088a0ce377b399da19f

diff --git a/doze/Android.mk b/doze/Android.mk
index aff1695716e4b463f8debc51d0b4a4c45fb11712..39bf2ac8685cdb81444e74ccd8bd6158aaacceda 100644 (file)
--- a/doze/Android.mk
+++ b/doze/Android.mk
@@ -13,12 +13,8 @@ LOCAL_PRIVILEGED_MODULE := true
 LOCAL_USE_AAPT2 := true
 
 LOCAL_STATIC_ANDROID_LIBRARIES := \
-    android-support-v4 \
-    android-support-v13 \
-    android-support-v7-appcompat \
-    android-support-v7-preference \
-    android-support-v7-recyclerview \
-    android-support-v14-preference
+    androidx.core_core \
+    androidx.preference_preference
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     org.lineageos.platform.internal
@@ -35,5 +31,3 @@ ifneq ($(INCREMENTAL_BUILDS),)
 endif
 
 include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))

diff --git a/doze/src/org/lineageos/settings/doze/TouchscreenGestureSettings.java b/doze/src/org/lineageos/settings/doze/TouchscreenGestureSettings.java
index 142f845bf3686e684e6233ac775e7a85894ed735..2954438fc9a20cdf09062a3d93ede272389c28aa 100644 (file)
--- a/doze/src/org/lineageos/settings/doze/TouchscreenGestureSettings.java
+++ b/doze/src/org/lineageos/settings/doze/TouchscreenGestureSettings.java
@@ -18,11 +18,11 @@ package org.lineageos.settings.doze;
 
 import android.app.ActionBar;
 import android.os.Bundle;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
 import android.provider.Settings;
 import android.view.MenuItem;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragment;
+import androidx.preference.SwitchPreference;
 
 import org.lineageos.internal.util.ScreenType;