oppo-common: DeviceHandler: Migrate to androidx

Change-Id: I3bf23a7c096cf79efe68223ecb93fb3d04818477

3 files changed, 17 insertions, 13 deletions

diff --git a/DeviceHandler/Android.mk b/DeviceHandler/Android.mk
index 438df9b..9ddab8d 100644
--- a/DeviceHandler/Android.mk
+++ b/DeviceHandler/Android.mk
@@ -24,4 +24,8 @@ LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 LOCAL_DEX_PREOPT := false
 
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+    androidx.core_core \
+    androidx.preference_preference
+
 include $(BUILD_PACKAGE)
diff --git a/DeviceHandler/src/com/slim/device/settings/ScreenOffGesture.java b/DeviceHandler/src/com/slim/device/settings/ScreenOffGesture.java
index 3e07e84..7846792 100644
--- a/DeviceHandler/src/com/slim/device/settings/ScreenOffGesture.java
+++ b/DeviceHandler/src/com/slim/device/settings/ScreenOffGesture.java
@@ -27,12 +27,12 @@ import android.content.res.Resources;
 import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceChangeListener;
-import android.preference.Preference.OnPreferenceClickListener;
-import android.preference.PreferenceFragment;
-import android.preference.PreferenceScreen;
-import android.preference.SwitchPreference;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.Preference.OnPreferenceClickListener;
+import androidx.preference.PreferenceFragment;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -47,7 +47,7 @@ import com.slim.device.R;
 import com.slim.device.util.ShortcutPickerHelper;
 
 public class ScreenOffGesture extends PreferenceFragment implements
-        OnPreferenceChangeListener, OnPreferenceClickListener,
+        Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener,
         ShortcutPickerHelper.OnPickListener {
 
     private static final String SETTINGS_METADATA_NAME = "com.android.settings";
diff --git a/DeviceHandler/src/com/slim/device/settings/SliderSettings.java b/DeviceHandler/src/com/slim/device/settings/SliderSettings.java
index c9f1c33..ec16387 100644
--- a/DeviceHandler/src/com/slim/device/settings/SliderSettings.java
+++ b/DeviceHandler/src/com/slim/device/settings/SliderSettings.java
@@ -18,11 +18,11 @@ package com.slim.device.settings;
 
 import android.app.ActionBar;
 import android.os.Bundle;
-import android.preference.ListPreference;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceChangeListener;
-import android.preference.PreferenceActivity;
-import android.preference.SwitchPreference;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.PreferenceActivity;
+import androidx.preference.SwitchPreference;
 import android.view.MenuItem;
 
 import com.slim.device.KernelControl;
@@ -30,7 +30,7 @@ import com.slim.device.R;
 import com.slim.device.util.FileUtils;
 
 public class SliderSettings extends PreferenceActivity
-        implements OnPreferenceChangeListener {
+        implements Preference.OnPreferenceChangeListener {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {