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

4
src/com/android/settings/datausage/AppDataUsage.java
View File

@@ -17,6 +17,7 @@ package com.android.settings.datausage;
import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
@@ -38,7 +39,6 @@ import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.PreferenceCategory;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.widget.EntityHeaderController;
@@ -348,7 +348,7 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
@Override
public int getMetricsCategory() {
return MetricsEvent.APP_DATA_USAGE;
return SettingsEnums.APP_DATA_USAGE;
}
private AdapterView.OnItemSelectedListener mCycleListener =

4
src/com/android/settings/datausage/BillingCyclePreference.java
View File

@@ -14,6 +14,7 @@
package com.android.settings.datausage;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.net.NetworkTemplate;
@@ -23,7 +24,6 @@ import android.util.AttributeSet;
import androidx.preference.Preference;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.datausage.CellDataPreference.DataStateListener;
@@ -79,7 +79,7 @@ public class BillingCyclePreference extends Preference implements TemplatePrefer
.setDestination(BillingCycleSettings.class.getName())
.setArguments(args)
.setTitleRes(R.string.billing_cycle)
.setSourceMetricsCategory(MetricsProto.MetricsEvent.VIEW_UNKNOWN)
.setSourceMetricsCategory(SettingsEnums.PAGE_UNKNOWN)
.toIntent();
}

10
src/com/android/settings/datausage/BillingCycleSettings.java
View File

@@ -18,6 +18,7 @@ import static android.net.NetworkPolicy.LIMIT_DISABLED;
import static android.net.NetworkPolicy.WARNING_DISABLED;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.DialogInterface;
import android.content.res.Resources;
@@ -39,7 +40,6 @@ import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -193,7 +193,7 @@ public class BillingCycleSettings extends DataUsageBaseFragment implements
@Override
public int getMetricsCategory() {
return MetricsEvent.BILLING_CYCLE;
return SettingsEnums.BILLING_CYCLE;
}
@Override
@@ -340,7 +340,7 @@ public class BillingCycleSettings extends DataUsageBaseFragment implements
@Override
public int getMetricsCategory() {
return MetricsEvent.DIALOG_BILLING_BYTE_LIMIT;
return SettingsEnums.DIALOG_BILLING_BYTE_LIMIT;
}
}
@@ -366,7 +366,7 @@ public class BillingCycleSettings extends DataUsageBaseFragment implements
@Override
public int getMetricsCategory() {
return MetricsEvent.DIALOG_BILLING_CYCLE;
return SettingsEnums.DIALOG_BILLING_CYCLE;
}
@Override
@@ -446,7 +446,7 @@ public class BillingCycleSettings extends DataUsageBaseFragment implements
@Override
public int getMetricsCategory() {
return MetricsEvent.DIALOG_BILLING_CONFIRM_LIMIT;
return SettingsEnums.DIALOG_BILLING_CONFIRM_LIMIT;
}
@Override

4
src/com/android/settings/datausage/CellDataPreference.java
View File

@@ -14,6 +14,7 @@
package com.android.settings.datausage;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.DialogInterface;
import android.database.ContentObserver;
@@ -37,7 +38,6 @@ import androidx.appcompat.app.AlertDialog.Builder;
import androidx.core.content.res.TypedArrayUtils;
import androidx.preference.PreferenceViewHolder;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.overlay.FeatureFactory;
@@ -136,7 +136,7 @@ public class CellDataPreference extends CustomDialogPreferenceCompat implements
protected void performClick(View view) {
final Context context = getContext();
FeatureFactory.getFactory(context).getMetricsFeatureProvider()
.action(context, MetricsEvent.ACTION_CELL_DATA_TOGGLE, !mChecked);
.action(context, SettingsEnums.ACTION_CELL_DATA_TOGGLE, !mChecked);
final SubscriptionInfo currentSir = mSubscriptionManager.getActiveSubscriptionInfo(
mSubId);
final SubscriptionInfo nextSir = mSubscriptionManager.getDefaultDataSubscriptionInfo();

8
src/com/android/settings/datausage/DataSaverBackend.java
View File

@@ -18,13 +18,13 @@ import static android.net.NetworkPolicyManager.POLICY_ALLOW_METERED_BACKGROUND;
import static android.net.NetworkPolicyManager.POLICY_NONE;
import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.net.INetworkPolicyListener;
import android.net.NetworkPolicyManager;
import android.os.RemoteException;
import android.util.SparseIntArray;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.utils.ThreadUtils;
@@ -73,7 +73,7 @@ public class DataSaverBackend {
public void setDataSaverEnabled(boolean enabled) {
mPolicyManager.setRestrictBackground(enabled);
mMetricsFeatureProvider.action(
mContext, MetricsEvent.ACTION_DATA_SAVER_MODE, enabled ? 1 : 0);
mContext, SettingsEnums.ACTION_DATA_SAVER_MODE, enabled ? 1 : 0);
}
public void refreshWhitelist() {
@@ -86,7 +86,7 @@ public class DataSaverBackend {
mUidPolicies.put(uid, policy);
if (whitelisted) {
mMetricsFeatureProvider.action(
mContext, MetricsEvent.ACTION_DATA_SAVER_WHITELIST, packageName);
mContext, SettingsEnums.ACTION_DATA_SAVER_WHITELIST, packageName);
}
}
@@ -116,7 +116,7 @@ public class DataSaverBackend {
mUidPolicies.put(uid, policy);
if (blacklisted) {
mMetricsFeatureProvider.action(
mContext, MetricsEvent.ACTION_DATA_SAVER_BLACKLIST, packageName);
mContext, SettingsEnums.ACTION_DATA_SAVER_BLACKLIST, packageName);
}
}

4
src/com/android/settings/datausage/DataSaverSummary.java
View File

@@ -15,6 +15,7 @@
package com.android.settings.datausage;
import android.app.Application;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import android.provider.SearchIndexableResource;
@@ -23,7 +24,6 @@ import android.widget.Switch;
import androidx.preference.Preference;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
@@ -113,7 +113,7 @@ public class DataSaverSummary extends SettingsPreferenceFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.DATA_SAVER_SUMMARY;
return SettingsEnums.DATA_SAVER_SUMMARY;
}
@Override

9
src/com/android/settings/datausage/DataUsageList.java
View File

@@ -22,6 +22,7 @@ import static android.net.TrafficStats.UID_TETHERING;
import android.app.Activity;
import android.app.ActivityManager;
import android.app.settings.SettingsEnums;
import android.app.usage.NetworkStats;
import android.app.usage.NetworkStats.Bucket;
import android.content.Context;
@@ -31,16 +32,13 @@ import android.graphics.Color;
import android.net.ConnectivityManager;
import android.net.NetworkPolicy;
import android.net.NetworkTemplate;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.RemoteException;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.text.format.DateUtils;
import android.util.Log;
import android.util.SparseArray;
import android.view.View;
@@ -55,14 +53,13 @@ import androidx.loader.content.Loader;
import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.datausage.CycleAdapter.SpinnerInterface;
import com.android.settings.widget.LoadingViewController;
import com.android.settingslib.AppItem;
import com.android.settingslib.net.NetworkCycleChartDataLoader;
import com.android.settingslib.net.NetworkCycleChartData;
import com.android.settingslib.net.NetworkCycleChartDataLoader;
import com.android.settingslib.net.NetworkStatsSummaryLoader;
import com.android.settingslib.net.UidDetailProvider;
@@ -122,7 +119,7 @@ public class DataUsageList extends DataUsageBaseFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.DATA_USAGE_LIST;
return SettingsEnums.DATA_USAGE_LIST;
}
@Override

4
src/com/android/settings/datausage/DataUsagePreference.java
View File

@@ -14,6 +14,7 @@
package com.android.settings.datausage;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.content.res.TypedArray;
@@ -26,7 +27,6 @@ import androidx.annotation.VisibleForTesting;
import androidx.core.content.res.TypedArrayUtils;
import androidx.preference.Preference;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settingslib.net.DataUsageController;
@@ -83,7 +83,7 @@ public class DataUsagePreference extends Preference implements TemplatePreferenc
launcher = new SubSettingLauncher(getContext())
.setArguments(args)
.setDestination(DataUsageList.class.getName())
.setSourceMetricsCategory(MetricsProto.MetricsEvent.VIEW_UNKNOWN);
.setSourceMetricsCategory(SettingsEnums.PAGE_UNKNOWN);
if (mTemplate.isMatchRuleMobile()) {
launcher.setTitleRes(R.string.app_cellular_data_usage);
} else {

4
src/com/android/settings/datausage/DataUsageSummary.java
View File

@@ -15,6 +15,7 @@
package com.android.settings.datausage;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.net.NetworkTemplate;
import android.os.Bundle;
@@ -33,7 +34,6 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.dashboard.SummaryLoader;
@@ -242,7 +242,7 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage
@Override
public int getMetricsCategory() {
return MetricsEvent.DATA_USAGE_SUMMARY;
return SettingsEnums.DATA_USAGE_SUMMARY;
}
@Override

4
src/com/android/settings/datausage/DataUsageSummaryPreference.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.datausage;
import android.annotation.AttrRes;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.graphics.Typeface;
@@ -37,7 +38,6 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settingslib.Utils;
@@ -213,7 +213,7 @@ public class DataUsageSummaryPreference extends Preference {
final SubSettingLauncher launcher = new SubSettingLauncher(context)
.setArguments(args)
.setDestination(DataUsageList.class.getName())
.setSourceMetricsCategory(MetricsProto.MetricsEvent.VIEW_UNKNOWN);
.setSourceMetricsCategory(SettingsEnums.PAGE_UNKNOWN);
launcher.setTitleRes(R.string.wifi_data_usage);
launcher.launch();
}

4
src/com/android/settings/datausage/UnrestrictedDataAccess.java
View File

@@ -14,6 +14,7 @@
package com.android.settings.datausage;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import android.provider.SearchIndexableResource;
@@ -22,7 +23,6 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -109,7 +109,7 @@ public class UnrestrictedDataAccess extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.DATA_USAGE_UNRESTRICTED_ACCESS;
return SettingsEnums.DATA_USAGE_UNRESTRICTED_ACCESS;
}
@Override

6
src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java
View File

@@ -16,6 +16,7 @@ package com.android.settings.datausage;
import static com.android.settingslib.RestrictedLockUtilsInternal.checkIfMeteredDataRestricted;
import android.app.Application;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.UserHandle;
@@ -23,7 +24,6 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.applications.AppStateBaseBridge;
import com.android.settings.core.BasePreferenceController;
@@ -225,8 +225,8 @@ public class UnrestrictedDataAccessPreferenceController extends BasePreferenceCo
@VisibleForTesting
void logSpecialPermissionChange(boolean whitelisted, String packageName) {
final int logCategory = whitelisted ? MetricsEvent.APP_SPECIAL_PERMISSION_UNL_DATA_ALLOW
: MetricsEvent.APP_SPECIAL_PERMISSION_UNL_DATA_DENY;
final int logCategory = whitelisted ? SettingsEnums.APP_SPECIAL_PERMISSION_UNL_DATA_ALLOW
: SettingsEnums.APP_SPECIAL_PERMISSION_UNL_DATA_DENY;
FeatureFactory.getFactory(mContext).getMetricsFeatureProvider().action(mContext,
logCategory, packageName);
}