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/fuelgauge/AdvancedPowerUsageDetail.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.fuelgauge;
import android.annotation.UserIdInt;
import android.app.Activity;
import android.app.ActivityManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
@@ -32,7 +33,6 @@ import android.view.View;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatteryStatsHelper;
import com.android.internal.util.ArrayUtils;
@@ -258,7 +258,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
@Override
public int getMetricsCategory() {
return MetricsEvent.FUELGAUGE_POWER_USAGE_DETAIL;
return SettingsEnums.FUELGAUGE_POWER_USAGE_DETAIL;
}
@Override

2
src/com/android/settings/fuelgauge/BatterySaverController.java
View File

@@ -22,8 +22,8 @@ import android.os.Handler;
import android.os.Looper;
import android.os.PowerManager;
import android.provider.Settings;
import android.provider.Settings.Global;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;

8
src/com/android/settings/fuelgauge/HighPowerDetail.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.fuelgauge;
import android.app.AppOpsManager;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener;
@@ -32,7 +33,6 @@ import androidx.annotation.VisibleForTesting;
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.applications.AppInfoBase;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -62,7 +62,7 @@ public class HighPowerDetail extends InstrumentedDialogFragment implements OnCli
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DIALOG_HIGH_POWER_DETAILS;
return SettingsEnums.DIALOG_HIGH_POWER_DETAILS;
}
@Override
@@ -153,8 +153,8 @@ public class HighPowerDetail extends InstrumentedDialogFragment implements OnCli
@VisibleForTesting
static void logSpecialPermissionChange(boolean whitelist, String packageName, Context context) {
int logCategory = whitelist ? MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_BATTERY_DENY
: MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_BATTERY_ALLOW;
int logCategory = whitelist ? SettingsEnums.APP_SPECIAL_PERMISSION_BATTERY_DENY
: SettingsEnums.APP_SPECIAL_PERMISSION_BATTERY_ALLOW;
FeatureFactory.getFactory(context).getMetricsFeatureProvider().action(context, logCategory,
packageName);
}

4
src/com/android/settings/fuelgauge/InactiveApps.java
View File

@@ -23,6 +23,7 @@ import static android.app.usage.UsageStatsManager.STANDBY_BUCKET_NEVER;
import static android.app.usage.UsageStatsManager.STANDBY_BUCKET_RARE;
import static android.app.usage.UsageStatsManager.STANDBY_BUCKET_WORKING_SET;
import android.app.settings.SettingsEnums;
import android.app.usage.UsageStatsManager;
import android.content.Context;
import android.content.Intent;
@@ -35,7 +36,6 @@ import androidx.preference.ListPreference;
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.SettingsPreferenceFragment;
@@ -58,7 +58,7 @@ public class InactiveApps extends SettingsPreferenceFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.FUELGAUGE_INACTIVE_APPS;
return SettingsEnums.FUELGAUGE_INACTIVE_APPS;
}
@Override

6
src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
View File

@@ -15,6 +15,7 @@ package com.android.settings.fuelgauge;
import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpdateType;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
@@ -27,7 +28,6 @@ import android.view.MenuItem;
import androidx.annotation.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.overlay.FeatureFactory;
@@ -81,7 +81,7 @@ public class PowerUsageAdvanced extends PowerUsageBase {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.FUELGAUGE_BATTERY_HISTORY_DETAIL;
return SettingsEnums.FUELGAUGE_BATTERY_HISTORY_DETAIL;
}
@Override
@@ -108,7 +108,7 @@ public class PowerUsageAdvanced extends PowerUsageBase {
mShowAllApps = !mShowAllApps;
item.setTitle(mShowAllApps ? R.string.hide_extra_apps : R.string.show_all_apps);
mMetricsFeatureProvider.action(getContext(),
MetricsProto.MetricsEvent.ACTION_SETTINGS_MENU_BATTERY_APPS_TOGGLE,
SettingsEnums.ACTION_SETTINGS_MENU_BATTERY_APPS_TOGGLE,
mShowAllApps);
restartBatteryStatsLoader(BatteryUpdateType.MANUAL);
return true;

4
src/com/android/settings/fuelgauge/PowerUsageSummary.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.fuelgauge;
import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpdateType;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.BatteryStats;
import android.os.Bundle;
@@ -35,7 +36,6 @@ import androidx.loader.app.LoaderManager;
import androidx.loader.app.LoaderManager.LoaderCallbacks;
import androidx.loader.content.Loader;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
@@ -225,7 +225,7 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList
@Override
public int getMetricsCategory() {
return MetricsEvent.FUELGAUGE_POWER_USAGE_SUMMARY_V2;
return SettingsEnums.FUELGAUGE_POWER_USAGE_SUMMARY_V2;
}
@Override

4
src/com/android/settings/fuelgauge/RestrictedAppDetails.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.fuelgauge;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
@@ -30,7 +31,6 @@ import androidx.preference.CheckBoxPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.InstrumentedPreferenceFragment;
@@ -132,7 +132,7 @@ public class RestrictedAppDetails extends DashboardFragment implements
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.FUELGAUGE_RESTRICTED_APP_DETAILS;
return SettingsEnums.FUELGAUGE_RESTRICTED_APP_DETAILS;
}
@Override

4
src/com/android/settings/fuelgauge/SmartBatterySettings.java
View File

@@ -16,11 +16,11 @@
package com.android.settings.fuelgauge;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.core.InstrumentedPreferenceFragment;
@@ -48,7 +48,7 @@ public class SmartBatterySettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.FUELGAUGE_SMART_BATTERY;
return SettingsEnums.FUELGAUGE_SMART_BATTERY;
}
@Override

2
src/com/android/settings/fuelgauge/batterysaver/BatterySaverSchedulePreferenceController.java
View File

@@ -20,9 +20,11 @@ import android.content.Context;
import android.os.PowerManager;
import android.provider.Settings;
import android.provider.Settings.Global;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;

2
src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSeekBarController.java
View File

@@ -20,9 +20,11 @@ import android.content.Context;
import android.os.PowerManager;
import android.provider.Settings;
import android.provider.Settings.Global;
import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.PreferenceScreen;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.Utils;

6
src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettings.java
View File

@@ -23,15 +23,19 @@ import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.preference.PreferenceScreen;
import com.android.settings.widget.RadioButtonPickerFragment;
import com.android.settings.R;
import com.android.settings.widget.RadioButtonPickerFragment;
import com.android.settings.widget.RadioButtonPreference;
import com.android.settingslib.fuelgauge.BatterySaverUtils;
import com.android.settingslib.widget.CandidateInfo;
import com.google.common.collect.Lists;
import java.util.List;
/**

7
src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java
View File

@@ -16,20 +16,17 @@
package com.android.settings.fuelgauge.batterysaver;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import android.provider.SearchIndexableResource;
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;
import com.android.settings.search.Indexable;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -47,7 +44,7 @@ public class BatterySaverSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.FUELGAUGE_BATTERY_SAVER;
return SettingsEnums.FUELGAUGE_BATTERY_SAVER;
}
@Override

5
src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java
View File

@@ -40,7 +40,6 @@ import android.util.Log;
import androidx.annotation.GuardedBy;
import androidx.annotation.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.util.ArrayUtils;
import com.android.settings.R;
import com.android.settings.fuelgauge.BatteryUtils;
@@ -154,7 +153,7 @@ public class AnomalyDetectionJobService extends JobService {
final String versionedPackage = packageName + "/" + versionCode;
if (batteryUtils.shouldHideAnomaly(powerWhitelistBackend, uid, anomalyInfo)) {
metricsFeatureProvider.action(SettingsEnums.PAGE_UNKNOWN,
MetricsProto.MetricsEvent.ACTION_ANOMALY_IGNORED,
SettingsEnums.ACTION_ANOMALY_IGNORED,
SettingsEnums.PAGE_UNKNOWN,
versionedPackage,
anomalyInfo.anomalyType);
@@ -172,7 +171,7 @@ public class AnomalyDetectionJobService extends JobService {
timeMs);
}
metricsFeatureProvider.action(SettingsEnums.PAGE_UNKNOWN,
MetricsProto.MetricsEvent.ACTION_ANOMALY_TRIGGERED,
SettingsEnums.ACTION_ANOMALY_TRIGGERED,
SettingsEnums.PAGE_UNKNOWN,
versionedPackage,
anomalyInfo.anomalyType);

12
src/com/android/settings/fuelgauge/batterytip/BatteryDatabaseManager.java
View File

@@ -19,14 +19,10 @@ package com.android.settings.fuelgauge.batterytip;
import static android.database.sqlite.SQLiteDatabase.CONFLICT_IGNORE;
import static android.database.sqlite.SQLiteDatabase.CONFLICT_REPLACE;
import static com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper.AnomalyColumns
.ANOMALY_STATE;
import static com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper.AnomalyColumns
.ANOMALY_TYPE;
import static com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper.AnomalyColumns
.PACKAGE_NAME;
import static com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper.AnomalyColumns
.TIME_STAMP_MS;
import static com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper.AnomalyColumns.ANOMALY_STATE;
import static com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper.AnomalyColumns.ANOMALY_TYPE;
import static com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper.AnomalyColumns.PACKAGE_NAME;
import static com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper.AnomalyColumns.TIME_STAMP_MS;
import static com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper.AnomalyColumns.UID;
import static com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper.Tables.TABLE_ACTION;
import static com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper.Tables.TABLE_ANOMALY;

4
src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.fuelgauge.batterytip;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.DialogInterface;
import android.os.Bundle;
@@ -27,7 +28,6 @@ import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
@@ -145,7 +145,7 @@ public class BatteryTipDialogFragment extends InstrumentedDialogFragment impleme
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.FUELGAUGE_BATTERY_TIP_DIALOG;
return SettingsEnums.FUELGAUGE_BATTERY_TIP_DIALOG;
}
@Override

4
src/com/android/settings/fuelgauge/batterytip/actions/BatterySaverAction.java
View File

@@ -16,9 +16,9 @@
package com.android.settings.fuelgauge.batterytip.actions;
import android.app.settings.SettingsEnums;
import android.content.Context;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.fuelgauge.BatterySaverUtils;
public class BatterySaverAction extends BatteryTipAction {
@@ -33,6 +33,6 @@ public class BatterySaverAction extends BatteryTipAction {
public void handlePositiveAction(int metricsKey) {
BatterySaverUtils.setPowerSaveMode(mContext, true, /*needFirstTimeWarning*/ true);
mMetricsFeatureProvider.action(mContext,
MetricsProto.MetricsEvent.ACTION_TIP_TURN_ON_BATTERY_SAVER, metricsKey);
SettingsEnums.ACTION_TIP_TURN_ON_BATTERY_SAVER, metricsKey);
}
}

4
src/com/android/settings/fuelgauge/batterytip/actions/OpenBatterySaverAction.java
View File

@@ -16,9 +16,9 @@
package com.android.settings.fuelgauge.batterytip.actions;
import android.app.settings.SettingsEnums;
import android.content.Context;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.fuelgauge.batterysaver.BatterySaverSettings;
@@ -38,7 +38,7 @@ public class OpenBatterySaverAction extends BatteryTipAction {
@Override
public void handlePositiveAction(int metricsKey) {
mMetricsFeatureProvider.action(mContext,
MetricsProto.MetricsEvent.ACTION_TIP_OPEN_BATTERY_SAVER_PAGE, metricsKey);
SettingsEnums.ACTION_TIP_OPEN_BATTERY_SAVER_PAGE, metricsKey);
new SubSettingLauncher(mContext)
.setDestination(BatterySaverSettings.class.getName())
.setSourceMetricsCategory(metricsKey)

5
src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentAction.java
View File

@@ -16,9 +16,10 @@
package com.android.settings.fuelgauge.batterytip.actions;
import android.app.settings.SettingsEnums;
import androidx.annotation.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.fuelgauge.RestrictedAppDetails;
import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper;
@@ -52,7 +53,7 @@ public class OpenRestrictAppFragmentAction extends BatteryTipAction {
@Override
public void handlePositiveAction(int metricsKey) {
mMetricsFeatureProvider.action(mContext,
MetricsProto.MetricsEvent.ACTION_TIP_OPEN_APP_RESTRICTION_PAGE, metricsKey);
SettingsEnums.ACTION_TIP_OPEN_APP_RESTRICTION_PAGE, metricsKey);
final List<AppInfo> mAppInfos = mRestrictAppTip.getRestrictAppList();
RestrictedAppDetails.startRestrictedAppDetails(mFragment, mAppInfos);

5
src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java
View File

@@ -22,7 +22,6 @@ import android.content.Context;
import androidx.annotation.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.util.CollectionUtils;
import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper;
@@ -65,14 +64,14 @@ public class RestrictAppAction extends BatteryTipAction {
if (CollectionUtils.isEmpty(appInfo.anomalyTypes)) {
// Only log context if there is no anomaly type
mMetricsFeatureProvider.action(SettingsEnums.PAGE_UNKNOWN,
MetricsProto.MetricsEvent.ACTION_TIP_RESTRICT_APP,
SettingsEnums.ACTION_TIP_RESTRICT_APP,
metricsKey,
packageName,
0);
} else {
for (int type : appInfo.anomalyTypes) {
mMetricsFeatureProvider.action(SettingsEnums.PAGE_UNKNOWN,
MetricsProto.MetricsEvent.ACTION_TIP_RESTRICT_APP,
SettingsEnums.ACTION_TIP_RESTRICT_APP,
metricsKey,
packageName,
type);

5
src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java
View File

@@ -16,9 +16,10 @@
package com.android.settings.fuelgauge.batterytip.actions;
import android.app.settings.SettingsEnums;
import androidx.fragment.app.Fragment;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.core.SubSettingLauncher;
@@ -41,7 +42,7 @@ public class SmartBatteryAction extends BatteryTipAction {
@Override
public void handlePositiveAction(int metricsKey) {
mMetricsFeatureProvider.action(mContext,
MetricsProto.MetricsEvent.ACTION_TIP_OPEN_SMART_BATTERY, metricsKey);
SettingsEnums.ACTION_TIP_OPEN_SMART_BATTERY, metricsKey);
new SubSettingLauncher(mSettingsActivity)
.setSourceMetricsCategory(mFragment instanceof Instrumentable
? ((Instrumentable) mFragment).getMetricsCategory()

3
src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java
View File

@@ -22,7 +22,6 @@ import android.content.Context;
import androidx.annotation.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settings.fuelgauge.batterytip.AppInfo;
import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip;
@@ -52,7 +51,7 @@ public class UnrestrictAppAction extends BatteryTipAction {
AppOpsManager.MODE_ALLOWED);
mMetricsFeatureProvider.action(
SettingsEnums.PAGE_UNKNOWN,
MetricsProto.MetricsEvent.ACTION_TIP_UNRESTRICT_APP,
SettingsEnums.ACTION_TIP_UNRESTRICT_APP,
metricsKey,
appInfo.packageName,
0);

1
src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
View File

@@ -26,7 +26,6 @@ import androidx.annotation.IntDef;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import com.android.settings.widget.CardPreference;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import java.lang.annotation.Retention;

4
src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTip.java
View File

@@ -16,10 +16,10 @@
package com.android.settings.fuelgauge.batterytip.tips;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Parcel;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -79,7 +79,7 @@ public class EarlyWarningTip extends BatteryTip {
@Override
public void log(Context context, MetricsFeatureProvider metricsFeatureProvider) {
metricsFeatureProvider.action(context, MetricsProto.MetricsEvent.ACTION_EARLY_WARNING_TIP,
metricsFeatureProvider.action(context, SettingsEnums.ACTION_EARLY_WARNING_TIP,
mState);
}

6
src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java
View File

@@ -16,13 +16,13 @@
package com.android.settings.fuelgauge.batterytip.tips;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Parcel;
import android.os.Parcelable;
import androidx.annotation.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.fuelgauge.batterytip.AppInfo;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -81,12 +81,12 @@ public class HighUsageTip extends BatteryTip {
@Override
public void log(Context context, MetricsFeatureProvider metricsFeatureProvider) {
metricsFeatureProvider.action(context, MetricsProto.MetricsEvent.ACTION_HIGH_USAGE_TIP,
metricsFeatureProvider.action(context, SettingsEnums.ACTION_HIGH_USAGE_TIP,
mState);
for (int i = 0, size = mHighUsageAppList.size(); i < size; i++) {
final AppInfo appInfo = mHighUsageAppList.get(i);
metricsFeatureProvider.action(context,
MetricsProto.MetricsEvent.ACTION_HIGH_USAGE_TIP_LIST,
SettingsEnums.ACTION_HIGH_USAGE_TIP_LIST,
appInfo.packageName);
}
}

4
src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTip.java
View File

@@ -16,11 +16,11 @@
package com.android.settings.fuelgauge.batterytip.tips;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Parcel;
import android.os.Parcelable;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -55,7 +55,7 @@ public class LowBatteryTip extends EarlyWarningTip {
@Override
public void log(Context context, MetricsFeatureProvider metricsFeatureProvider) {
metricsFeatureProvider.action(context, MetricsProto.MetricsEvent.ACTION_LOW_BATTERY_TIP,
metricsFeatureProvider.action(context, SettingsEnums.ACTION_LOW_BATTERY_TIP,
mState);
}

5
src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java
View File

@@ -24,7 +24,6 @@ import android.os.Parcel;
import androidx.annotation.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.fuelgauge.batterytip.AppInfo;
@@ -120,14 +119,14 @@ public class RestrictAppTip extends BatteryTip {
@Override
public void log(Context context, MetricsFeatureProvider metricsFeatureProvider) {
metricsFeatureProvider.action(context, MetricsProto.MetricsEvent.ACTION_APP_RESTRICTION_TIP,
metricsFeatureProvider.action(context, SettingsEnums.ACTION_APP_RESTRICTION_TIP,
mState);
if (mState == StateType.NEW) {
for (int i = 0, size = mRestrictAppList.size(); i < size; i++) {
final AppInfo appInfo = mRestrictAppList.get(i);
for (Integer anomalyType : appInfo.anomalyTypes) {
metricsFeatureProvider.action(SettingsEnums.PAGE_UNKNOWN,
MetricsProto.MetricsEvent.ACTION_APP_RESTRICTION_TIP_LIST,
SettingsEnums.ACTION_APP_RESTRICTION_TIP_LIST,
SettingsEnums.PAGE_UNKNOWN,
appInfo.packageName,
anomalyType);

4
src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTip.java
View File

@@ -16,10 +16,10 @@
package com.android.settings.fuelgauge.batterytip.tips;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Parcel;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -58,7 +58,7 @@ public class SmartBatteryTip extends BatteryTip {
@Override
public void log(Context context, MetricsFeatureProvider metricsFeatureProvider) {
metricsFeatureProvider.action(context, MetricsProto.MetricsEvent.ACTION_SMART_BATTERY_TIP,
metricsFeatureProvider.action(context, SettingsEnums.ACTION_SMART_BATTERY_TIP,
mState);
}

4
src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java
View File

@@ -16,13 +16,13 @@
package com.android.settings.fuelgauge.batterytip.tips;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Parcel;
import android.os.Parcelable;
import androidx.annotation.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -71,7 +71,7 @@ public class SummaryTip extends BatteryTip {
@Override
public void log(Context context, MetricsFeatureProvider metricsFeatureProvider) {
metricsFeatureProvider.action(context, MetricsProto.MetricsEvent.ACTION_SUMMARY_TIP,
metricsFeatureProvider.action(context, SettingsEnums.ACTION_SUMMARY_TIP,
mState);
}