summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Martins <bgcngm@gmail.com>2019-07-09 22:31:00 +0100
committerJan Altensen <info@stricted.net>2020-03-20 14:56:44 +0100
commite7dad9c0bfea60142ce726da0199e66515f8ba2e (patch)
tree5a2222fd86f24083aa5f09eb4ac3e4501a8199ac
parente603bb91e6048b5b89b588779152603b710c23fa (diff)
downloadandroid_hardware_samsung-e7dad9c0bfea60142ce726da0199e66515f8ba2e.tar.gz
android_hardware_samsung-e7dad9c0bfea60142ce726da0199e66515f8ba2e.tar.bz2
android_hardware_samsung-e7dad9c0bfea60142ce726da0199e66515f8ba2e.zip
samsung: Doze: Migrate to androidx
Change-Id: Ifaa67283a3437549a2304088a0ce377b399da19f
-rw-r--r--doze/Android.mk10
-rw-r--r--doze/src/org/lineageos/settings/doze/TouchscreenGestureSettings.java6
2 files changed, 5 insertions, 11 deletions
diff --git a/doze/Android.mk b/doze/Android.mk
index aff1695..39bf2ac 100644
--- 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 142f845..2954438 100644
--- 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;