PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate Settings to androidx.

Browse Source 
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Merged-In: I941dea40562170649bf056e675cc32e5163c0e39
(cherry picked from commit a290b873d0)
This commit is contained in:
Aurimas Liutikas
2018-04-17 11:22:43 -07:00
committed by Colin Cross
parent 6e65a32468
commit b1af85d155
1189 changed files with 2368 additions and 2368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/network/AirplaneModePreferenceController.java
View File

@@ -23,9 +23,9 @@ import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.SystemProperties;
import android.provider.SettingsSlicesContract;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import android.text.TextUtils;
import com.android.internal.telephony.TelephonyIntents;

14
src/com/android/settings/network/ApnEditor.java
View File

@@ -28,13 +28,13 @@ import android.net.Uri;
import android.os.Bundle;
import android.os.PersistableBundle;
import android.provider.Telephony;
import android.support.annotation.VisibleForTesting;
import android.support.v14.preference.MultiSelectListPreference;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.EditTextPreference;
import android.support.v7.preference.ListPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceChangeListener;
import androidx.annotation.VisibleForTesting;
import androidx.preference.MultiSelectListPreference;
import androidx.preference.SwitchPreference;
import androidx.preference.EditTextPreference;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceChangeListener;
import android.telephony.CarrierConfigManager;
import android.telephony.ServiceState;
import android.telephony.SubscriptionManager;

4
src/com/android/settings/network/ApnPreference.java
View File

@@ -21,8 +21,8 @@ import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.provider.Telephony;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceViewHolder;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
import android.telephony.SubscriptionManager;
import android.util.AttributeSet;
import android.util.Log;

4
src/com/android/settings/network/ApnSettings.java
View File

@@ -37,8 +37,8 @@ import android.os.PersistableBundle;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Telephony;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceGroup;
import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;

6
src/com/android/settings/network/MobileNetworkPreferenceController.java
View File

@@ -24,9 +24,9 @@ import android.content.Intent;
import android.content.IntentFilter;
import android.os.UserManager;
import android.provider.Settings;
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.PhoneStateListener;
import android.telephony.ServiceState;
import android.telephony.TelephonyManager;

2
src/com/android/settings/network/MobilePlanPreferenceController.java
View File

@@ -31,7 +31,7 @@ import android.net.NetworkInfo;
import android.net.Uri;
import android.os.Bundle;
import android.os.UserManager;
import android.support.v7.preference.Preference;
import androidx.preference.Preference;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.util.Log;

2
src/com/android/settings/network/NetworkDashboardFragment.java
View File

@@ -24,7 +24,7 @@ import android.app.Dialog;
import android.app.Fragment;
import android.content.Context;
import android.provider.SearchIndexableResource;
import android.support.annotation.VisibleForTesting;
import androidx.annotation.VisibleForTesting;
import android.text.BidiFormatter;
import android.util.Log;

2
src/com/android/settings/network/NetworkResetRestrictionChecker.java
View File

@@ -19,7 +19,7 @@ package com.android.settings.network;
import android.content.Context;
import android.os.UserHandle;
import android.os.UserManager;
import android.support.annotation.VisibleForTesting;
import androidx.annotation.VisibleForTesting;
import com.android.settingslib.RestrictedLockUtils;

6
src/com/android/settings/network/NetworkScorerPicker.java
View File

@@ -19,9 +19,9 @@ import android.content.Context;
import android.net.NetworkScoreManager;
import android.net.NetworkScorerAppData;
import android.os.Bundle;
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.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;

2
src/com/android/settings/network/NetworkScorerPickerPreferenceController.java
View File

@@ -18,7 +18,7 @@ package com.android.settings.network;
import android.content.Context;
import android.net.NetworkScoreManager;
import android.net.NetworkScorerAppData;
import android.support.v7.preference.Preference;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;

2
src/com/android/settings/network/PrivateDnsModeDialogPreference.java
View File

@@ -29,7 +29,7 @@ import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.provider.Settings;
import android.support.annotation.VisibleForTesting;
import androidx.annotation.VisibleForTesting;
import android.system.Os;
import android.text.Editable;
import android.text.TextWatcher;

4
src/com/android/settings/network/PrivateDnsPreferenceController.java
View File

@@ -35,8 +35,8 @@ import android.net.Uri;
import android.os.Handler;
import android.os.Looper;
import android.provider.Settings;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.util.ArrayUtils;
import com.android.settings.R;

4
src/com/android/settings/network/ProxyPreferenceController.java
View File

@@ -17,8 +17,8 @@ package com.android.settings.network;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;

6
src/com/android/settings/network/TetherPreferenceController.java
View File

@@ -33,9 +33,9 @@ import android.os.Bundle;
import android.os.Handler;
import android.os.UserHandle;
import android.provider.Settings;
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 com.android.settings.R;
import com.android.settings.TetherSettings;

6
src/com/android/settings/network/VpnPreferenceController.java
View File

@@ -29,9 +29,9 @@ import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
import android.provider.SettingsSlicesContract;
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.util.Log;
import android.util.SparseArray;