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

Merge "Fix anomalyEventId metrices action." into main

Browse Source
This commit is contained in:
YK Hung
2023-09-29 06:31:24 +00:00
committed by Android (Google) Code Review
parent c0c4bc065d 2385e3a714
commit a191396363
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,10 +146,15 @@ public class BatteryUsageBreakdownController extends BasePreferenceController
return false; return false;
} }
private String getActionKey(String packageName) { private boolean isAnomalyBatteryDiffEntry(BatteryDiffEntry entry) {
final String actionKey = TextUtils.isEmpty(packageName) return mIsHighlightSlot && mAnomalyEntryKey != null
? PACKAGE_NAME_NONE : packageName; && mAnomalyEntryKey.equals(entry.getKey());
return mAnomalyEventId == null ? actionKey : actionKey + "|" + mAnomalyEventId; }
private String getActionKey(BatteryDiffEntry entry) {
final String actionKey = TextUtils.isEmpty(entry.getPackageName())
? PACKAGE_NAME_NONE : entry.getPackageName();
return !isAnomalyBatteryDiffEntry(entry) ? actionKey : actionKey + "|" + mAnomalyEventId;
} }
@Override @Override
@@ -159,17 +164,16 @@ 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();
final String packageName = diffEntry.getPackageName();
mMetricsFeatureProvider.action( mMetricsFeatureProvider.action(
/* attribution */ SettingsEnums.OPEN_BATTERY_USAGE, /* attribution */ SettingsEnums.OPEN_BATTERY_USAGE,
/* action */ diffEntry.isSystemEntry() /* action */ diffEntry.isSystemEntry()
? SettingsEnums.ACTION_BATTERY_USAGE_SYSTEM_ITEM ? SettingsEnums.ACTION_BATTERY_USAGE_SYSTEM_ITEM
: SettingsEnums.ACTION_BATTERY_USAGE_APP_ITEM, : SettingsEnums.ACTION_BATTERY_USAGE_APP_ITEM,
/* pageId */ SettingsEnums.OPEN_BATTERY_USAGE, /* pageId */ SettingsEnums.OPEN_BATTERY_USAGE,
getActionKey(packageName), getActionKey(diffEntry),
(int) Math.round(diffEntry.getPercentage())); (int) Math.round(diffEntry.getPercentage()));
Log.d(TAG, String.format("handleClick() label=%s key=%s package=%s", Log.d(TAG, String.format("handleClick() label=%s key=%s package=%s",
diffEntry.getAppLabel(), diffEntry.getKey(), packageName)); diffEntry.getAppLabel(), diffEntry.getKey(), diffEntry.getPackageName()));
AdvancedPowerUsageDetail.startBatteryDetailPage( AdvancedPowerUsageDetail.startBatteryDetailPage(
mActivity, mFragment, diffEntry, powerPref.getPercentage(), mSlotTimestamp); mActivity, mFragment, diffEntry, powerPref.getPercentage(), mSlotTimestamp);
return true; return true;
@@ -324,9 +328,7 @@ public class BatteryUsageBreakdownController extends BasePreferenceController
pref.setOrder(prefIndex); pref.setOrder(prefIndex);
pref.setSingleLineTitle(true); pref.setSingleLineTitle(true);
// Updates App item preference style // Updates App item preference style
pref.setAnomalyHint(mIsHighlightSlot && mAnomalyEntryKey != null pref.setAnomalyHint(isAnomalyBatteryDiffEntry(entry) ? mAnomalyHintString : null);
&& mAnomalyEntryKey.equals(entry.getKey())
? mAnomalyHintString : null);
// Sets the BatteryDiffEntry to preference for launching detailed page. // Sets the BatteryDiffEntry to preference for launching detailed page.
pref.setBatteryDiffEntry(entry); pref.setBatteryDiffEntry(entry);
pref.setSelectable(entry.validForRestriction()); pref.setSelectable(entry.validForRestriction());