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

Migrate all MetricsProto enums to SettingsEnums

Browse Source 
Bug: 122855168
Test: rebuild
Change-Id: I962d9a71179f86b7cae9dc5e9a00e0aa1557dc76
This commit is contained in:
Fan Zhang
2019-01-16 13:49:47 -08:00
parent dbaa5459b8
commit 31b210017b
502 changed files with 1184 additions and 1347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,6 @@ import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.SystemProperties;
import android.text.TextUtils;
import androidx.fragment.app.Fragment;
import androidx.preference.Preference;

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

@@ -19,6 +19,7 @@ package com.android.settings.network;
import static android.content.Context.TELEPHONY_SERVICE;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.ContentValues;
import android.content.Context;
import android.content.Intent;
@@ -49,7 +50,6 @@ import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.SwitchPreference;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.telephony.PhoneConstants;
import com.android.internal.util.ArrayUtils;
import com.android.settings.R;
@@ -483,7 +483,7 @@ public class ApnEditor extends SettingsPreferenceFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.APN_EDITOR;
return SettingsEnums.APN_EDITOR;
}
@VisibleForTesting
@@ -1202,7 +1202,7 @@ public class ApnEditor extends SettingsPreferenceFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.DIALOG_APN_EDITOR_ERROR;
return SettingsEnums.DIALOG_APN_EDITOR_ERROR;
}
}

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

@@ -19,6 +19,7 @@ package com.android.settings.network;
import android.app.Activity;
import android.app.Dialog;
import android.app.ProgressDialog;
import android.app.settings.SettingsEnums;
import android.content.BroadcastReceiver;
import android.content.ContentResolver;
import android.content.ContentValues;
@@ -51,7 +52,6 @@ import android.widget.Toast;
import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.telephony.PhoneConstants;
import com.android.internal.telephony.TelephonyIntents;
import com.android.internal.telephony.uicc.UiccController;
@@ -173,7 +173,7 @@ public class ApnSettings extends RestrictedSettingsFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.APN;
return SettingsEnums.APN;
}
@Override
@@ -518,7 +518,7 @@ public class ApnSettings extends RestrictedSettingsFragment
@Override
public int getDialogMetricsCategory(int dialogId) {
if (dialogId == DIALOG_RESTORE_DEFAULTAPN) {
return MetricsEvent.DIALOG_APN_RESTORE_DEFAULT;
return SettingsEnums.DIALOG_APN_RESTORE_DEFAULT;
}
return 0;
}

12
src/com/android/settings/network/MobileNetworkListController.java
View File

@@ -26,6 +26,12 @@ import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.util.ArrayMap;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.network.telephony.MobileNetworkActivity;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -33,12 +39,6 @@ import com.android.settingslib.core.AbstractPreferenceController;
import java.util.List;
import java.util.Map;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
/**
* This populates the entries on a page which lists all available mobile subscriptions. Each entry
* has the name of the subscription with some subtext giving additional detail, and clicking on the

12
src/com/android/settings/network/MobileNetworkSummaryController.java
View File

@@ -24,18 +24,18 @@ import android.content.Intent;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import com.android.settings.R;
import com.android.settings.network.telephony.MobileNetworkActivity;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.List;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.network.telephony.MobileNetworkActivity;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.List;
public class MobileNetworkSummaryController extends AbstractPreferenceController implements
SubscriptionsChangeListener.SubscriptionsChangeListenerClient, LifecycleObserver {
private static final String TAG = "MobileNetSummaryCtlr";

12
src/com/android/settings/network/MultiNetworkHeaderController.java
View File

@@ -16,17 +16,17 @@
package com.android.settings.network;
import android.app.settings.SettingsEnums;
import android.content.Context;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.wifi.WifiConnectionPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.wifi.WifiConnectionPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
// This controls a header at the top of the Network & internet page that only appears when there
// are two or more active mobile subscriptions. It shows an overview of available network
// connections with an entry for wifi (if connected) and an entry for each subscription.
@@ -52,7 +52,7 @@ public class MultiNetworkHeaderController extends BasePreferenceController imple
WifiConnectionPreferenceController createWifiController(Lifecycle lifecycle) {
final int prefOrder = 0;
return new WifiConnectionPreferenceController(mContext, lifecycle, this, mPreferenceKey,
prefOrder, MetricsProto.MetricsEvent.SETTINGS_NETWORK_CATEGORY);
prefOrder, SettingsEnums.SETTINGS_NETWORK_CATEGORY);
}
@VisibleForTesting

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

@@ -15,10 +15,10 @@
*/
package com.android.settings.network;
import static com.android.settings.network.MobilePlanPreferenceController
.MANAGE_MOBILE_PLAN_DIALOG_ID;
import static com.android.settings.network.MobilePlanPreferenceController.MANAGE_MOBILE_PLAN_DIALOG_ID;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.SearchIndexableResource;
import android.util.Log;
@@ -26,7 +26,6 @@ import android.util.Log;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.FeatureFlags;
import com.android.settings.dashboard.DashboardFragment;
@@ -51,7 +50,7 @@ public class NetworkDashboardFragment extends DashboardFragment implements
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SETTINGS_NETWORK_CATEGORY;
return SettingsEnums.SETTINGS_NETWORK_CATEGORY;
}
@Override
@@ -158,7 +157,7 @@ public class NetworkDashboardFragment extends DashboardFragment implements
@Override
public int getDialogMetricsCategory(int dialogId) {
if (MANAGE_MOBILE_PLAN_DIALOG_ID == dialogId) {
return MetricsProto.MetricsEvent.DIALOG_MANAGE_MOBILE_PLAN;
return SettingsEnums.DIALOG_MANAGE_MOBILE_PLAN;
}
return 0;
}

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

@@ -15,6 +15,7 @@
*/
package com.android.settings.network;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.net.NetworkScoreManager;
import android.net.NetworkScorerAppData;
@@ -28,7 +29,6 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.widget.RadioButtonPreference;
@@ -45,7 +45,7 @@ public class NetworkScorerPicker extends InstrumentedPreferenceFragment implemen
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SETTINGS_NETWORK_SCORER;
return SettingsEnums.SETTINGS_NETWORK_SCORER;
}
@Override

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

@@ -19,11 +19,10 @@ import static android.net.ConnectivityManager.PRIVATE_DNS_DEFAULT_MODE_FALLBACK;
import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OFF;
import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC;
import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME;
import static android.system.OsConstants.AF_INET;
import static android.system.OsConstants.AF_INET6;
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import android.app.settings.SettingsEnums;
import android.content.ActivityNotFoundException;
import android.content.ContentResolver;
import android.content.Context;
@@ -33,7 +32,6 @@ import android.net.NetworkUtils;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
import android.system.Os;
import android.text.Editable;
import android.text.TextWatcher;
import android.text.method.LinkMovementMethod;
@@ -49,7 +47,6 @@ import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import androidx.preference.PreferenceViewHolder;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.utils.AnnotationSpan;
@@ -203,7 +200,7 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat
}
FeatureFactory.getFactory(context).getMetricsFeatureProvider().action(context,
MetricsProto.MetricsEvent.ACTION_PRIVATE_DNS_MODE, mMode);
SettingsEnums.ACTION_PRIVATE_DNS_MODE, mMode);
Settings.Global.putString(context.getContentResolver(), MODE_KEY, mMode);
}
}

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

@@ -45,11 +45,11 @@ import com.android.internal.util.ArrayUtils;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import java.net.InetAddress;
import java.util.List;

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

@@ -20,12 +20,12 @@ import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import androidx.annotation.VisibleForTesting;
public class SubscriptionUtil {
private static List<SubscriptionInfo> sResultsForTesting;

12
src/com/android/settings/network/SubscriptionsPreferenceController.java
View File

@@ -25,12 +25,6 @@ import android.provider.Settings;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import com.android.settings.R;
import com.android.settings.network.telephony.MobileNetworkActivity;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.Map;
import androidx.collection.ArrayMap;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleObserver;
@@ -39,6 +33,12 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.network.telephony.MobileNetworkActivity;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.Map;
/**
* This manages a set of Preferences it places into a PreferenceGroup owned by some parent
* controller class - one for each available subscription. This controller is only considered

2
src/com/android/settings/network/telephony/CarrierPreferenceController.java
View File

@@ -16,8 +16,8 @@
package com.android.settings.network.telephony;
import android.content.Context;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;

1
src/com/android/settings/network/telephony/DataServiceSetupPreferenceController.java
View File

@@ -26,7 +26,6 @@ import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import com.android.internal.telephony.PhoneConstants;

1
src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
View File

@@ -17,7 +17,6 @@
package com.android.settings.network.telephony;
import android.content.Context;
import android.content.res.Resources;
import android.os.PersistableBundle;
import android.provider.Settings;
import android.telephony.CarrierConfigManager;

3
src/com/android/settings/network/telephony/EuiccPreferenceController.java
View File

@@ -18,9 +18,6 @@ package com.android.settings.network.telephony;
import android.content.Context;
import android.content.Intent;
import android.os.PersistableBundle;
import android.provider.Settings;
import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.telephony.euicc.EuiccManager;

2
src/com/android/settings/network/telephony/MobileNetworkUtils.java
View File

@@ -27,7 +27,6 @@ import android.database.Cursor;
import android.os.PersistableBundle;
import android.os.SystemProperties;
import android.provider.Settings;
import android.service.carrier.CarrierMessagingService;
import android.telecom.PhoneAccountHandle;
import android.telecom.TelecomManager;
import android.telephony.CarrierConfigManager;
@@ -45,7 +44,6 @@ import com.android.ims.ImsException;
import com.android.ims.ImsManager;
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneConstants;
import com.android.settings.R;
import java.util.Arrays;
import java.util.List;

3
src/com/android/settings/network/telephony/NetworkSelectSettings.java
View File

@@ -37,7 +37,6 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.telephony.OperatorInfo;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
@@ -162,7 +161,7 @@ public class NetworkSelectSettings extends DashboardFragment {
mSelectedPreference.setSummary(R.string.network_connecting);
mMetricsFeatureProvider.action(getContext(),
MetricsEvent.ACTION_MOBILE_NETWORK_MANUAL_SELECT_NETWORK);
SettingsEnums.ACTION_MOBILE_NETWORK_MANUAL_SELECT_NETWORK);
// Set summary as "Disconnected" to the previously connected network
if (mConnectedPreferenceCategory.getPreferenceCount() > 0) {

3
src/com/android/settings/network/telephony/RoamingDialogFragment.java
View File

@@ -26,9 +26,6 @@ import android.os.PersistableBundle;
import android.telephony.CarrierConfigManager;
import android.telephony.TelephonyManager;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;

2
src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java
View File

@@ -19,13 +19,11 @@ package com.android.settings.network.telephony.cdma;
import android.content.Context;
import android.os.SystemProperties;
import android.provider.Settings;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceManager;
import com.android.internal.telephony.Phone;
import com.android.settings.network.telephony.MobileNetworkUtils;

1
src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java
View File

@@ -31,7 +31,6 @@ import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.network.telephony.MobileNetworkUtils;
import com.android.settings.network.telephony.MobileNetworkActivity;
import com.android.settings.network.telephony.NetworkSelectSettings;
import java.util.ArrayList;

1
src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java
View File

@@ -32,7 +32,6 @@ import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.network.telephony.MobileNetworkUtils;
import com.android.settings.network.telephony.MobileNetworkActivity;
import com.android.settings.network.telephony.NetworkSelectSettings;
/**