Migrate Settings to androidx.

Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
This commit is contained in:
Aurimas Liutikas
2018-04-17 11:22:43 -07:00
parent 538a4594ff
commit e0069d332d
1161 changed files with 2316 additions and 2316 deletions

View File

@@ -32,9 +32,9 @@ import android.net.TrafficStats;
import android.os.Bundle;
import android.os.RemoteException;
import android.os.UserHandle;
import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceCategory;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import android.util.ArraySet;
import android.util.IconDrawableFactory;
import android.util.Log;

View File

@@ -15,7 +15,7 @@
package com.android.settings.datausage;
import android.content.Context;
import android.support.v7.preference.PreferenceViewHolder;
import androidx.preference.PreferenceViewHolder;
import android.view.View;
import android.widget.ProgressBar;

View File

@@ -19,7 +19,7 @@ package com.android.settings.datausage;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.support.v7.preference.Preference;
import androidx.preference.Preference;
import android.util.ArraySet;
import com.android.settingslib.utils.AsyncLoader;

View File

@@ -21,7 +21,7 @@ import android.content.Intent;
import android.net.NetworkTemplate;
import android.os.Bundle;
import android.os.RemoteException;
import android.support.v7.preference.Preference;
import androidx.preference.Preference;
import android.util.AttributeSet;
import android.util.FeatureFlagUtils;

View File

@@ -27,8 +27,8 @@ import android.content.res.Resources;
import android.net.NetworkPolicy;
import android.net.NetworkTemplate;
import android.os.Bundle;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import androidx.preference.SwitchPreference;
import androidx.preference.Preference;
import android.text.format.Time;
import android.util.FeatureFlagUtils;
import android.util.Log;

View File

@@ -25,9 +25,9 @@ import android.os.Looper;
import android.os.Parcel;
import android.os.Parcelable;
import android.provider.Settings.Global;
import android.support.annotation.VisibleForTesting;
import android.support.v4.content.res.TypedArrayUtils;
import android.support.v7.preference.PreferenceViewHolder;
import androidx.annotation.VisibleForTesting;
import androidx.core.content.res.TypedArrayUtils;
import androidx.preference.PreferenceViewHolder;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
@@ -57,7 +57,7 @@ public class CellDataPreference extends CustomDialogPreference implements Templa
public CellDataPreference(Context context, AttributeSet attrs) {
super(context, attrs, TypedArrayUtils.getAttr(context,
android.support.v7.preference.R.attr.switchPreferenceStyle,
androidx.preference.R.attr.switchPreferenceStyle,
android.R.attr.switchPreferenceStyle));
}

View File

@@ -18,9 +18,9 @@ import android.content.Context;
import android.net.NetworkPolicy;
import android.net.NetworkStatsHistory;
import android.net.TrafficStats;
import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceViewHolder;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
import android.text.SpannableStringBuilder;
import android.text.TextUtils;
import android.text.format.Formatter;

View File

@@ -15,7 +15,7 @@
package com.android.settings.datausage;
import android.content.Context;
import android.support.v7.preference.Preference;
import androidx.preference.Preference;
import android.util.AttributeSet;
import com.android.settings.R;

View File

@@ -16,7 +16,7 @@ package com.android.settings.datausage;
import android.app.Application;
import android.os.Bundle;
import android.support.v7.preference.Preference;
import androidx.preference.Preference;
import android.widget.Switch;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

View File

@@ -41,9 +41,9 @@ import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceGroup;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;

View File

@@ -19,8 +19,8 @@ import android.content.Intent;
import android.content.res.TypedArray;
import android.net.NetworkTemplate;
import android.os.Bundle;
import android.support.v4.content.res.TypedArrayUtils;
import android.support.v7.preference.Preference;
import androidx.core.content.res.TypedArrayUtils;
import androidx.preference.Preference;
import android.util.AttributeSet;
import android.util.FeatureFlagUtils;
@@ -41,7 +41,7 @@ public class DataUsagePreference extends Preference implements TemplatePreferenc
final TypedArray a = context.obtainStyledAttributes(
attrs, new int[] {com.android.internal.R.attr.title},
TypedArrayUtils.getAttr(
context, android.support.v7.preference.R.attr.preferenceStyle,
context, androidx.preference.R.attr.preferenceStyle,
android.R.attr.preferenceStyle), 0);
mTitleRes = a.getResourceId(0, 0);
a.recycle();

View File

@@ -21,9 +21,9 @@ import android.content.Intent;
import android.net.NetworkTemplate;
import android.os.Bundle;
import android.provider.SearchIndexableResource;
import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.SubscriptionPlan;

View File

@@ -23,9 +23,9 @@ import android.net.NetworkTemplate;
import android.os.Bundle;
import android.os.UserManager;
import android.provider.SearchIndexableResource;
import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.text.BidiFormatter;

View File

@@ -22,8 +22,8 @@ import android.content.Intent;
import android.graphics.Typeface;
import android.net.NetworkTemplate;
import android.os.Bundle;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceViewHolder;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.TextUtils;

View File

@@ -21,9 +21,9 @@ import android.content.Context;
import android.content.Intent;
import android.net.NetworkPolicyManager;
import android.net.NetworkTemplate;
import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.Preference;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.recyclerview.widget.RecyclerView;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.SubscriptionPlan;

View File

@@ -16,7 +16,7 @@ package com.android.settings.datausage;
import android.content.Context;
import android.net.NetworkTemplate;
import android.support.v7.preference.Preference;
import androidx.preference.Preference;
import android.util.AttributeSet;
public class NetworkRestrictionsPreference extends Preference implements TemplatePreference {

View File

@@ -15,8 +15,8 @@
package com.android.settings.datausage;
import android.content.Context;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceViewHolder;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
import android.util.AttributeSet;
import android.view.View;
import android.widget.AdapterView;

View File

@@ -16,8 +16,8 @@ package com.android.settings.datausage;
import android.content.Context;
import android.net.NetworkTemplate;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceCategory;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import android.util.AttributeSet;
public class TemplatePreferenceCategory extends PreferenceCategory implements TemplatePreference {

View File

@@ -20,8 +20,8 @@ import android.app.Application;
import android.content.Context;
import android.os.Bundle;
import android.os.UserHandle;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceViewHolder;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;