From f202bc2b2c8b44b97513268d8bb1fdda5eed517d Mon Sep 17 00:00:00 2001 From: ronaxdevil Date: Mon, 7 Oct 2019 03:46:11 +0530 Subject: [PATCH] sanders: LineageActions: Migrate to androidx Signed-off-by: ronaxdevil --- LineageActions/Android.mk | 5 +---- .../settings/device/ActionsPreferenceFragment.java | 2 +- .../settings/device/DozeSettingsFragment.java | 6 +++--- .../settings/device/FPGestureSettingsFragment.java | 6 +++--- .../settings/device/GestureSettingsFragment.java | 2 +- .../device/ScreenOffGestureSettingsFragment.java | 6 +++--- .../settings/device/dirac/DiracSettingsFragment.java | 12 ++++++------ 7 files changed, 18 insertions(+), 21 deletions(-) diff --git a/LineageActions/Android.mk b/LineageActions/Android.mk index f474d46..298f61c 100644 --- a/LineageActions/Android.mk +++ b/LineageActions/Android.mk @@ -12,10 +12,7 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_USE_AAPT2 := true LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-v14-preference \ - android-support-v7-appcompat \ - android-support-v7-preference \ - android-support-v7-recyclerview \ + androidx.preference_preference \ org.lineageos.platform.internal LOCAL_PROGUARD_FLAG_FILES := proguard.flags diff --git a/LineageActions/src/org/lineageos/settings/device/ActionsPreferenceFragment.java b/LineageActions/src/org/lineageos/settings/device/ActionsPreferenceFragment.java index e48047d..52d664c 100644 --- a/LineageActions/src/org/lineageos/settings/device/ActionsPreferenceFragment.java +++ b/LineageActions/src/org/lineageos/settings/device/ActionsPreferenceFragment.java @@ -18,7 +18,7 @@ package org.lineageos.settings.device; import android.os.Bundle; -import android.support.v14.preference.PreferenceFragment; +import androidx.preference.PreferenceFragment; public class ActionsPreferenceFragment extends PreferenceFragment { @Override diff --git a/LineageActions/src/org/lineageos/settings/device/DozeSettingsFragment.java b/LineageActions/src/org/lineageos/settings/device/DozeSettingsFragment.java index 547d803..77cbfc2 100644 --- a/LineageActions/src/org/lineageos/settings/device/DozeSettingsFragment.java +++ b/LineageActions/src/org/lineageos/settings/device/DozeSettingsFragment.java @@ -18,10 +18,10 @@ package org.lineageos.settings.device; import android.app.ActionBar; import android.os.Bundle; -import android.support.v14.preference.PreferenceFragment; +import androidx.preference.PreferenceFragment; import android.provider.Settings; -import android.support.v7.preference.Preference; -import android.support.v14.preference.SwitchPreference; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import android.view.MenuItem; import android.view.LayoutInflater; import android.view.View; diff --git a/LineageActions/src/org/lineageos/settings/device/FPGestureSettingsFragment.java b/LineageActions/src/org/lineageos/settings/device/FPGestureSettingsFragment.java index 4f6a22b..7038895 100644 --- a/LineageActions/src/org/lineageos/settings/device/FPGestureSettingsFragment.java +++ b/LineageActions/src/org/lineageos/settings/device/FPGestureSettingsFragment.java @@ -21,10 +21,10 @@ import android.os.Bundle; import android.content.Context; import android.content.SharedPreferences.Editor; import android.preference.PreferenceManager; -import android.support.v7.preference.PreferenceCategory; -import android.support.v14.preference.SwitchPreference; +import androidx.preference.PreferenceCategory; +import androidx.preference.SwitchPreference; import android.hardware.fingerprint.FingerprintManager; -import android.support.v14.preference.PreferenceFragment; +import androidx.preference.PreferenceFragment; import android.view.MenuItem; import android.view.LayoutInflater; import android.view.View; diff --git a/LineageActions/src/org/lineageos/settings/device/GestureSettingsFragment.java b/LineageActions/src/org/lineageos/settings/device/GestureSettingsFragment.java index 9a9bb14..59e627a 100644 --- a/LineageActions/src/org/lineageos/settings/device/GestureSettingsFragment.java +++ b/LineageActions/src/org/lineageos/settings/device/GestureSettingsFragment.java @@ -17,7 +17,7 @@ package org.lineageos.settings.device; import android.os.Bundle; -import android.support.v14.preference.PreferenceFragment; +import androidx.preference.PreferenceFragment; public class GestureSettingsFragment extends PreferenceFragment { diff --git a/LineageActions/src/org/lineageos/settings/device/ScreenOffGestureSettingsFragment.java b/LineageActions/src/org/lineageos/settings/device/ScreenOffGestureSettingsFragment.java index ff7db33..6cb3400 100644 --- a/LineageActions/src/org/lineageos/settings/device/ScreenOffGestureSettingsFragment.java +++ b/LineageActions/src/org/lineageos/settings/device/ScreenOffGestureSettingsFragment.java @@ -18,9 +18,9 @@ package org.lineageos.settings.device; import android.os.Bundle; import android.provider.Settings; -import android.support.v7.preference.Preference; -import android.support.v14.preference.SwitchPreference; -import android.support.v14.preference.PreferenceFragment; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceFragment; import android.view.MenuItem; import static android.provider.Settings.Secure.DOUBLE_TAP_TO_WAKE; diff --git a/LineageActions/src/org/lineageos/settings/device/dirac/DiracSettingsFragment.java b/LineageActions/src/org/lineageos/settings/device/dirac/DiracSettingsFragment.java index 14d466a..fccc05c 100644 --- a/LineageActions/src/org/lineageos/settings/device/dirac/DiracSettingsFragment.java +++ b/LineageActions/src/org/lineageos/settings/device/dirac/DiracSettingsFragment.java @@ -23,12 +23,12 @@ import android.content.DialogInterface; import android.content.SharedPreferences; import android.os.Bundle; import android.os.Handler; -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.PreferenceCategory; -import android.support.v7.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceFragment; +import androidx.preference.SwitchPreference; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.Preference.OnPreferenceChangeListener; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View;