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

Merge "Update the logic for logging anomaly information to WW." into main

Browse Source
This commit is contained in:
Zaiyue Xue
2024-03-04 08:00:08 +00:00
committed by Android (Google) Code Review
parent a399c73ba0 51740f6540
commit 62132fffb2
1 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java
View File

@@ -65,6 +65,8 @@ public class BatteryUsageBreakdownController extends BasePreferenceController
private static final String SPINNER_PREFERENCE_KEY = "battery_usage_spinner"; private static final String SPINNER_PREFERENCE_KEY = "battery_usage_spinner";
private static final String APP_LIST_PREFERENCE_KEY = "app_list"; private static final String APP_LIST_PREFERENCE_KEY = "app_list";
private static final String PACKAGE_NAME_NONE = "none"; private static final String PACKAGE_NAME_NONE = "none";
private static final String SLOT_TIMESTAMP = "slot_timestamp";
private static final String ANOMALY_KEY = "anomaly_key";
private static final List<BatteryDiffEntry> EMPTY_ENTRY_LIST = new ArrayList<>(); private static final List<BatteryDiffEntry> EMPTY_ENTRY_LIST = new ArrayList<>();
private static int sUiMode = Configuration.UI_MODE_NIGHT_UNDEFINED; private static int sUiMode = Configuration.UI_MODE_NIGHT_UNDEFINED;
@@ -77,7 +79,7 @@ public class BatteryUsageBreakdownController extends BasePreferenceController
@VisibleForTesting final Map<String, Preference> mPreferenceCache = new ArrayMap<>(); @VisibleForTesting final Map<String, Preference> mPreferenceCache = new ArrayMap<>();
private int mSpinnerPosition; private int mSpinnerPosition;
private String mSlotTimestamp; private String mSlotInformation;
@VisibleForTesting Context mPrefContext; @VisibleForTesting Context mPrefContext;
@VisibleForTesting PreferenceCategory mRootPreference; @VisibleForTesting PreferenceCategory mRootPreference;
@@ -87,7 +89,7 @@ public class BatteryUsageBreakdownController extends BasePreferenceController
@VisibleForTesting BatteryDiffData mBatteryDiffData; @VisibleForTesting BatteryDiffData mBatteryDiffData;
@VisibleForTesting String mPercentLessThanThresholdText; @VisibleForTesting String mPercentLessThanThresholdText;
@VisibleForTesting boolean mIsHighlightSlot; @VisibleForTesting boolean mIsHighlightSlot;
@VisibleForTesting String mAnomalyEventId; @VisibleForTesting int mAnomalyKeyNumber;
@VisibleForTesting String mAnomalyEntryKey; @VisibleForTesting String mAnomalyEntryKey;
@VisibleForTesting String mAnomalyHintString; @VisibleForTesting String mAnomalyHintString;
@VisibleForTesting String mAnomalyHintPrefKey; @VisibleForTesting String mAnomalyHintPrefKey;
@@ -142,12 +144,25 @@ public class BatteryUsageBreakdownController extends BasePreferenceController
&& mAnomalyEntryKey.equals(entry.getKey()); && mAnomalyEntryKey.equals(entry.getKey());
} }
private String getActionKey(BatteryDiffEntry entry) { private void logPreferenceClickedMetrics(BatteryDiffEntry entry) {
final String actionKey = final int attribution = SettingsEnums.OPEN_BATTERY_USAGE;
final int action = entry.isSystemEntry()
? SettingsEnums.ACTION_BATTERY_USAGE_SYSTEM_ITEM
: SettingsEnums.ACTION_BATTERY_USAGE_APP_ITEM;
final int pageId = SettingsEnums.OPEN_BATTERY_USAGE;
final String packageName =
TextUtils.isEmpty(entry.getPackageName()) TextUtils.isEmpty(entry.getPackageName())
? PACKAGE_NAME_NONE ? PACKAGE_NAME_NONE
: entry.getPackageName(); : entry.getPackageName();
return !isAnomalyBatteryDiffEntry(entry) ? actionKey : actionKey + "|" + mAnomalyEventId; final int percentage = (int) Math.round(entry.getPercentage());
final int slotTimestamp = (int) (mBatteryDiffData.getStartTimestamp() / 1000);
mMetricsFeatureProvider.action(attribution, action, pageId, packageName, percentage);
mMetricsFeatureProvider.action(attribution, action, pageId, SLOT_TIMESTAMP, slotTimestamp);
if (isAnomalyBatteryDiffEntry(entry)) {
mMetricsFeatureProvider.action(
attribution, action, pageId, ANOMALY_KEY, mAnomalyKeyNumber);
}
} }
@Override @Override
@@ -157,14 +172,7 @@ public class BatteryUsageBreakdownController extends BasePreferenceController
} }
final PowerGaugePreference powerPref = (PowerGaugePreference) preference; final PowerGaugePreference powerPref = (PowerGaugePreference) preference;
final BatteryDiffEntry diffEntry = powerPref.getBatteryDiffEntry(); final BatteryDiffEntry diffEntry = powerPref.getBatteryDiffEntry();
mMetricsFeatureProvider.action( logPreferenceClickedMetrics(diffEntry);
/* attribution */ SettingsEnums.OPEN_BATTERY_USAGE,
/* action */ diffEntry.isSystemEntry()
? SettingsEnums.ACTION_BATTERY_USAGE_SYSTEM_ITEM
: SettingsEnums.ACTION_BATTERY_USAGE_APP_ITEM,
/* pageId */ SettingsEnums.OPEN_BATTERY_USAGE,
getActionKey(diffEntry),
(int) Math.round(diffEntry.getPercentage()));
Log.d( Log.d(
TAG, TAG,
String.format( String.format(
@@ -179,7 +187,7 @@ public class BatteryUsageBreakdownController extends BasePreferenceController
mFragment.getMetricsCategory(), mFragment.getMetricsCategory(),
diffEntry, diffEntry,
powerPref.getPercentage(), powerPref.getPercentage(),
mSlotTimestamp, mSlotInformation,
/* showTimeInformation= */ true, /* showTimeInformation= */ true,
anomalyHintPrefKey, anomalyHintPrefKey,
anomalyHintText); anomalyHintText);
@@ -245,13 +253,14 @@ public class BatteryUsageBreakdownController extends BasePreferenceController
boolean isHighlightSlot, boolean isHighlightSlot,
Optional<AnomalyEventWrapper> optionalAnomalyEventWrapper) { Optional<AnomalyEventWrapper> optionalAnomalyEventWrapper) {
mBatteryDiffData = slotUsageData; mBatteryDiffData = slotUsageData;
mSlotTimestamp = slotTimestamp; mSlotInformation = slotTimestamp;
mIsHighlightSlot = isHighlightSlot; mIsHighlightSlot = isHighlightSlot;
if (optionalAnomalyEventWrapper != null) { if (optionalAnomalyEventWrapper != null) {
final AnomalyEventWrapper anomalyEventWrapper = final AnomalyEventWrapper anomalyEventWrapper =
optionalAnomalyEventWrapper.orElse(null); optionalAnomalyEventWrapper.orElse(null);
mAnomalyEventId = anomalyEventWrapper != null ? anomalyEventWrapper.getEventId() : null; mAnomalyKeyNumber =
anomalyEventWrapper != null ? anomalyEventWrapper.getAnomalyKeyNumber() : -1;
mAnomalyEntryKey = mAnomalyEntryKey =
anomalyEventWrapper != null ? anomalyEventWrapper.getAnomalyEntryKey() : null; anomalyEventWrapper != null ? anomalyEventWrapper.getAnomalyEntryKey() : null;
mAnomalyHintString = mAnomalyHintString =