sm8150-common: KeyHandler: Migrate to androidx

Change-Id: I28470b0ff18cdd53d23d2a01deb79e3f4a3f35fe
PotatoDevices · May 15, 2020 · 14afef8 · 14afef8
1 parent 9eab710
commit 14afef8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git a/KeyHandler/Android.mk b/KeyHandler/Android.mk
@@ -27,12 +27,8 @@ LOCAL_PACKAGE_NAME := KeyHandler
 LOCAL_USE_AAPT2 := true
 
 LOCAL_STATIC_ANDROID_LIBRARIES := \
-    android-support-v4 \
-    android-support-v7-appcompat \
-    android-support-v7-preference \
-    android-support-v7-recyclerview \
-    android-support-v13 \
-    android-support-v14-preference
+    androidx.core_core \
+    androidx.preference_preference
 
 LOCAL_RESOURCE_DIR := \
     $(LOCAL_PATH)/res \

diff --git a/KeyHandler/src/com/potato/settings/slider_settings/ButtonSettingsFragment.java b/KeyHandler/src/com/potato/settings/slider_settings/ButtonSettingsFragment.java
@@ -18,16 +18,16 @@
 package com.potato.settings.slider_settings;
 
 import android.os.Bundle;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.Preference.OnPreferenceChangeListener;
-import android.support.v7.preference.PreferenceGroup;
 import android.text.TextUtils;
 import android.view.MenuItem;
+import androidx.preference.PreferenceFragment;
+import androidx.preference.SwitchPreference;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.PreferenceGroup;
 
-import com.android.internal.util.cr.FileUtils;
+import com.android.internal.util.potato.FileUtils;
 import com.potato.settings.slider_settings.utils.Constants;
 
 public class ButtonSettingsFragment extends PreferenceFragment

diff --git a/KeyHandler/src/com/potato/settings/slider_settings/utils/Constants.java b/KeyHandler/src/com/potato/settings/slider_settings/utils/Constants.java
@@ -24,8 +24,6 @@
 import android.content.SharedPreferences;
 import android.os.UserHandle;
 import android.provider.Settings;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.PreferenceManager;
 
 import android.media.AudioManager;