From 9ad4b97e43256655d5aff87cece7f4eab7d56bd5 Mon Sep 17 00:00:00 2001
From: Davide Garberi <dade.garberi@gmail.com>
Date: Tue, 5 Oct 2021 22:50:03 +0200
Subject: msm8996-common: ConfigPanel: Migrate to androidx

Change-Id: Ia741c785c3ca1d6fb3d41ac68d64865731fba129
---
 configpanel/Android.mk                                   |  8 ++------
 .../lineageos/settings/device/BootCompletedReceiver.java |  3 ++-
 .../settings/device/ButtonSettingsFragment.java          | 16 ++++++++--------
 configpanel/src/org/lineageos/settings/device/Utils.java |  7 ++++---
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/configpanel/Android.mk b/configpanel/Android.mk
index 02d1a07..61fcf01 100644
--- a/configpanel/Android.mk
+++ b/configpanel/Android.mk
@@ -12,12 +12,8 @@ LOCAL_PRODUCT_MODULE := true
 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_STATIC_JAVA_LIBRARIES := \
     org.lineageos.platform.internal
diff --git a/configpanel/src/org/lineageos/settings/device/BootCompletedReceiver.java b/configpanel/src/org/lineageos/settings/device/BootCompletedReceiver.java
index 90546b4..4caf988 100644
--- a/configpanel/src/org/lineageos/settings/device/BootCompletedReceiver.java
+++ b/configpanel/src/org/lineageos/settings/device/BootCompletedReceiver.java
@@ -23,9 +23,10 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.SharedPreferences;
-import android.support.v7.preference.PreferenceManager;
 import android.util.Log;
 
+import androidx.preference.PreferenceManager;
+
 import org.lineageos.internal.util.FileUtils;
 
 public class BootCompletedReceiver extends BroadcastReceiver {
diff --git a/configpanel/src/org/lineageos/settings/device/ButtonSettingsFragment.java b/configpanel/src/org/lineageos/settings/device/ButtonSettingsFragment.java
index d23e939..199e367 100644
--- a/configpanel/src/org/lineageos/settings/device/ButtonSettingsFragment.java
+++ b/configpanel/src/org/lineageos/settings/device/ButtonSettingsFragment.java
@@ -20,21 +20,21 @@ package org.lineageos.settings.device;
 import android.app.ActionBar;
 import android.content.SharedPreferences;
 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.PreferenceCategory;
-import android.support.v7.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.view.MenuItem;
 
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceFragment;
+import androidx.preference.PreferenceManager;
+import androidx.preference.SwitchPreference;
+
 import org.lineageos.internal.util.FileUtils;
 import org.lineageos.internal.util.PackageManagerUtils;
 
 public class ButtonSettingsFragment extends PreferenceFragment
-        implements OnPreferenceChangeListener {
+        implements Preference.OnPreferenceChangeListener {
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
diff --git a/configpanel/src/org/lineageos/settings/device/Utils.java b/configpanel/src/org/lineageos/settings/device/Utils.java
index 9b3b2d7..79eaea8 100644
--- a/configpanel/src/org/lineageos/settings/device/Utils.java
+++ b/configpanel/src/org/lineageos/settings/device/Utils.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 The CyanogenMod Project
- *           (C) 2017 The LineageOS Project
+ *           (C) 2017-2019 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.UserHandle;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.PreferenceManager;
+
+import androidx.preference.PreferenceManager;
+import androidx.preference.SwitchPreference;
 
 public class Utils {
 
-- 
cgit v1.2.3