lineage-sdk: Migrate to androidx

* Migrate from support library to androidx

* Various improvements and cleanup by @bgcngm

Change-Id: I10bbf5056125e8309f344c3eb18cc628bd7ec34e
This commit is contained in:
Sam Mortimer
2019-05-13 15:28:04 -07:00
parent eb05519d5d
commit 3533d385d9
18 changed files with 61 additions and 63 deletions

View File

@@ -24,10 +24,6 @@ import android.content.pm.ResolveInfo;
import android.content.res.TypedArray;
import android.os.SystemProperties;
import android.os.UserHandle;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceGroup;
import android.support.v7.preference.PreferenceManager;
import android.support.v7.preference.PreferenceViewHolder;
import android.telephony.TelephonyManager;
import android.util.ArraySet;
import android.util.AttributeSet;
@@ -35,6 +31,11 @@ import android.util.Log;
import android.util.TypedValue;
import android.widget.TextView;
import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceViewHolder;
import java.util.List;
import java.util.Objects;
import java.util.Set;

View File

@@ -23,7 +23,6 @@ import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.os.Bundle;
import android.os.UserHandle;
import android.support.v7.preference.R;
import android.util.AttributeSet;
import android.util.Log;
@@ -94,8 +93,9 @@ public class RemotePreference extends SelfRemovingPreference
}
public RemotePreference(Context context, AttributeSet attrs) {
this(context, attrs, ConstraintsHelper.getAttr(
context, R.attr.preferenceScreenStyle, android.R.attr.preferenceScreenStyle));
this(context, attrs, ConstraintsHelper.getAttr(context,
androidx.preference.R.attr.preferenceScreenStyle,
android.R.attr.preferenceScreenStyle));
}
@Override

View File

@@ -17,11 +17,12 @@
package lineageos.preference;
import android.content.Context;
import android.support.v7.preference.DropDownPreference;
import android.support.v7.preference.PreferenceDataStore;
import android.support.v7.preference.PreferenceViewHolder;
import android.util.AttributeSet;
import androidx.preference.DropDownPreference;
import androidx.preference.PreferenceDataStore;
import androidx.preference.PreferenceViewHolder;
/**
* A Preference which can automatically remove itself from the hierarchy
* based on constraints set in XML.

View File

@@ -17,11 +17,12 @@
package lineageos.preference;
import android.content.Context;
import android.support.v7.preference.ListPreference;
import android.support.v7.preference.PreferenceDataStore;
import android.support.v7.preference.PreferenceViewHolder;
import android.util.AttributeSet;
import androidx.preference.ListPreference;
import androidx.preference.PreferenceDataStore;
import androidx.preference.PreferenceViewHolder;
/**
* A Preference which can automatically remove itself from the hierarchy
* based on constraints set in XML.

View File

@@ -16,11 +16,11 @@
package lineageos.preference;
import android.content.Context;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceViewHolder;
import android.support.v7.preference.R;
import android.util.AttributeSet;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
/**
* A Preference which can automatically remove itself from the hierarchy
* based on constraints set in XML.
@@ -40,8 +40,9 @@ public class SelfRemovingPreference extends Preference {
}
public SelfRemovingPreference(Context context, AttributeSet attrs) {
this(context, attrs, ConstraintsHelper.getAttr(
context, R.attr.preferenceStyle, android.R.attr.preferenceStyle));
this(context, attrs, ConstraintsHelper.getAttr(context,
androidx.preference.R.attr.preferenceStyle,
android.R.attr.preferenceStyle));
}
public SelfRemovingPreference(Context context) {

View File

@@ -17,11 +17,12 @@
package lineageos.preference;
import android.content.Context;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceDataStore;
import android.support.v7.preference.PreferenceViewHolder;
import android.util.AttributeSet;
import androidx.preference.PreferenceDataStore;
import androidx.preference.PreferenceViewHolder;
import androidx.preference.SwitchPreference;
/**
* A SwitchPreference which can automatically remove itself from the hierarchy
* based on constraints set in XML.

View File

@@ -51,7 +51,7 @@ public class LineagePartsPreference extends RemotePreference {
}
public LineagePartsPreference(Context context, AttributeSet attrs) {
this(context, attrs, android.support.v7.preference.R.attr.preferenceScreenStyle);
this(context, attrs, androidx.preference.R.attr.preferenceScreenStyle);
}
@Override

View File

@@ -19,11 +19,12 @@ package org.lineageos.internal.preference;
import android.content.Context;
import android.os.SystemProperties;
import android.support.v7.preference.EditTextPreference;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.util.Log;
import androidx.preference.EditTextPreference;
import lineageos.providers.LineageSettings;
public class HostnamePreference extends EditTextPreference {

View File

@@ -18,10 +18,11 @@ package org.lineageos.internal.preference.deviceinfo;
import android.content.Context;
import android.content.Intent;
import android.support.v7.preference.Preference;
import android.util.AttributeSet;
import android.util.Log;
import androidx.preference.Preference;
import lineageos.preference.SelfRemovingPreference;
import org.lineageos.platform.internal.R;