diff --git a/doze/Android.mk b/doze/Android.mk index 6922ce7..ca106b3 100644 --- a/doze/Android.mk +++ b/doze/Android.mk @@ -14,12 +14,8 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_USE_AAPT2 := true LOCAL_STATIC_ANDROID_LIBRARIES := \ - android-support-v4 \ - android-support-v13 \ - android-support-v7-recyclerview \ - android-support-v7-preference \ - android-support-v7-appcompat \ - android-support-v14-preference + androidx.core_core \ + androidx.preference_preference LOCAL_RESOURCE_DIR := \ $(LOCAL_PATH)/res \ diff --git a/doze/src/org/lineageos/settings/doze/DozeSettingsFragment.java b/doze/src/org/lineageos/settings/doze/DozeSettingsFragment.java index 517ecf6..be5216e 100644 --- a/doze/src/org/lineageos/settings/doze/DozeSettingsFragment.java +++ b/doze/src/org/lineageos/settings/doze/DozeSettingsFragment.java @@ -27,11 +27,6 @@ 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.Preference; -import android.support.v7.preference.PreferenceCategory; -import android.support.v7.preference.Preference.OnPreferenceChangeListener; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; @@ -39,6 +34,11 @@ import android.view.ViewGroup; import android.widget.CompoundButton; import android.widget.Switch; import android.widget.TextView; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceFragment; +import androidx.preference.SwitchPreference; public class DozeSettingsFragment extends PreferenceFragment implements OnPreferenceChangeListener, CompoundButton.OnCheckedChangeListener { diff --git a/doze/src/org/lineageos/settings/doze/Utils.java b/doze/src/org/lineageos/settings/doze/Utils.java index d0e4c3f..d2c9ee9 100644 --- a/doze/src/org/lineageos/settings/doze/Utils.java +++ b/doze/src/org/lineageos/settings/doze/Utils.java @@ -22,9 +22,9 @@ import android.content.Intent; import android.hardware.Sensor; import android.hardware.SensorManager; import android.os.UserHandle; -import android.support.v7.preference.PreferenceManager; import android.provider.Settings; import android.util.Log; +import androidx.preference.PreferenceManager; import com.android.internal.hardware.AmbientDisplayConfiguration;