From 252388e55956c1b6d9fa2e69eaa4d127a89cf3b2 Mon Sep 17 00:00:00 2001 From: Jan Altensen Date: Sat, 7 Sep 2019 21:10:20 +0200 Subject: [PATCH] samsung: AdvancedDisplay: Migrate to androidx Change-Id: I9f6f936120e6eac06c78525f3692207ff58c991f --- AdvancedDisplay/Android.mk | 12 ++++++------ .../settings/device/AdvancedDisplayFragment.java | 3 ++- .../settings/device/mDNIeAccessibility.java | 10 +++++----- .../org/lineageos/settings/device/mDNIeScenario.java | 10 +++++----- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/AdvancedDisplay/Android.mk b/AdvancedDisplay/Android.mk index f5e778d7..c04fb470 100644 --- a/AdvancedDisplay/Android.mk +++ b/AdvancedDisplay/Android.mk @@ -12,12 +12,12 @@ LOCAL_CERTIFICATE := platform 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.appcompat_appcompat \ + androidx.preference_preference \ + androidx.recyclerview_recyclerview \ + androidx.legacy_legacy-preference-v14 \ + androidx.legacy_legacy-support-v4 \ + androidx.legacy_legacy-support-v13 LOCAL_STATIC_JAVA_LIBRARIES := \ org.lineageos.platform.internal diff --git a/AdvancedDisplay/src/org/lineageos/settings/device/AdvancedDisplayFragment.java b/AdvancedDisplay/src/org/lineageos/settings/device/AdvancedDisplayFragment.java index c27e4563..371a203b 100644 --- a/AdvancedDisplay/src/org/lineageos/settings/device/AdvancedDisplayFragment.java +++ b/AdvancedDisplay/src/org/lineageos/settings/device/AdvancedDisplayFragment.java @@ -19,9 +19,10 @@ package org.lineageos.settings.device; import android.app.ActionBar; import android.content.res.Resources; import android.os.Bundle; -import android.support.v14.preference.PreferenceFragment; import android.view.MenuItem; +import androidx.preference.PreferenceFragment; + import org.lineageos.settings.device.R; import org.lineageos.internal.util.FileUtils; diff --git a/AdvancedDisplay/src/org/lineageos/settings/device/mDNIeAccessibility.java b/AdvancedDisplay/src/org/lineageos/settings/device/mDNIeAccessibility.java index 2d931d14..a2849661 100644 --- a/AdvancedDisplay/src/org/lineageos/settings/device/mDNIeAccessibility.java +++ b/AdvancedDisplay/src/org/lineageos/settings/device/mDNIeAccessibility.java @@ -19,15 +19,15 @@ package org.lineageos.settings.device; import android.content.Context; import android.content.SharedPreferences; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.Preference; -import android.support.v7.preference.Preference.OnPreferenceChangeListener; -import android.support.v7.preference.PreferenceManager; import android.util.AttributeSet; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceManager; + import org.lineageos.internal.util.FileUtils; -public class mDNIeAccessibility extends ListPreference implements OnPreferenceChangeListener { +public class mDNIeAccessibility extends ListPreference implements Preference.OnPreferenceChangeListener { private static String FILE = null; diff --git a/AdvancedDisplay/src/org/lineageos/settings/device/mDNIeScenario.java b/AdvancedDisplay/src/org/lineageos/settings/device/mDNIeScenario.java index 9261f7cc..37d57927 100644 --- a/AdvancedDisplay/src/org/lineageos/settings/device/mDNIeScenario.java +++ b/AdvancedDisplay/src/org/lineageos/settings/device/mDNIeScenario.java @@ -19,15 +19,15 @@ package org.lineageos.settings.device; import android.content.Context; import android.content.SharedPreferences; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.Preference; -import android.support.v7.preference.Preference.OnPreferenceChangeListener; -import android.support.v7.preference.PreferenceManager; import android.util.AttributeSet; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceManager; + import org.lineageos.internal.util.FileUtils; -public class mDNIeScenario extends ListPreference implements OnPreferenceChangeListener { +public class mDNIeScenario extends ListPreference implements Preference.OnPreferenceChangeListener { private static String FILE = null;