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

Merge "Adjust optimize page logging timing" into sc-v2-dev am: b4e13a7af0 am: 3be2b733f2

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16170324

Change-Id: I66ecbb8213e9fb6301d75cacb493813180df1e18
This commit is contained in:
TreeHugger Robot
2021-11-03 05:41:03 +00:00
committed by Automerger Merge Worker
parent c77286a817 3be2b733f2
commit 6d2db7a8cf
2 changed files with 68 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
View File

@@ -271,6 +271,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
initHeader();
if (mEnableTriState) {
mOptimizationMode = mBatteryOptimizeUtils.getAppOptimizationMode();
initPreferenceForTriState(getContext());
final String packageName = mBatteryOptimizeUtils.getPackageName();
FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider()
@@ -287,8 +288,11 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
public void onPause() {
super.onPause();
if (mEnableTriState) {
Log.d(TAG, "Leave with mode: " + getSelectedPreference());
mBatteryOptimizeUtils.setAppUsageState(getSelectedPreference());
final int selectedPreference = getSelectedPreference();
logMetricCategory(selectedPreference);
mBatteryOptimizeUtils.setAppUsageState(selectedPreference);
Log.d(TAG, "Leave with mode: " + selectedPreference);
}
}
@@ -461,26 +465,6 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
updatePreferenceState(mUnrestrictedPreference, selectedKey);
updatePreferenceState(mOptimizePreference, selectedKey);
updatePreferenceState(mRestrictedPreference, selectedKey);
// Logs metric.
int metricCategory = 0;
if (selectedKey.equals(mUnrestrictedPreference.getKey())) {
metricCategory = SettingsEnums.ACTION_APP_BATTERY_USAGE_UNRESTRICTED;
} else if (selectedKey.equals(mOptimizePreference.getKey())) {
metricCategory = SettingsEnums.ACTION_APP_BATTERY_USAGE_OPTIMIZED;
} else if (selectedKey.equals(mRestrictedPreference.getKey())) {
metricCategory = SettingsEnums.ACTION_APP_BATTERY_USAGE_RESTRICTED;
}
if (metricCategory != 0) {
FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider()
.action(
getContext(),
metricCategory,
new Pair(ConvertUtils.METRIC_KEY_PACKAGE,
mBatteryOptimizeUtils.getPackageName()),
new Pair(ConvertUtils.METRIC_KEY_BATTERY_USAGE,
getArguments().getString(EXTRA_POWER_USAGE_PERCENT)));
}
}
private void updatePreferenceState(SelectorWithWidgetPreference preference,
@@ -488,6 +472,36 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
preference.setChecked(selectedKey.equals(preference.getKey()));
}
private void logMetricCategory(int selectedKey) {
if (selectedKey == mOptimizationMode) {
return;
}
int metricCategory = 0;
switch (selectedKey) {
case BatteryOptimizeUtils.MODE_UNRESTRICTED:
metricCategory = SettingsEnums.ACTION_APP_BATTERY_USAGE_UNRESTRICTED;
break;
case BatteryOptimizeUtils.MODE_OPTIMIZED:
metricCategory = SettingsEnums.ACTION_APP_BATTERY_USAGE_OPTIMIZED;
break;
case BatteryOptimizeUtils.MODE_RESTRICTED:
metricCategory = SettingsEnums.ACTION_APP_BATTERY_USAGE_RESTRICTED;
break;
}
if (metricCategory != 0) {
FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider()
.action(
getContext(),
metricCategory,
new Pair(ConvertUtils.METRIC_KEY_PACKAGE,
mBatteryOptimizeUtils.getPackageName()),
new Pair(ConvertUtils.METRIC_KEY_BATTERY_USAGE,
getArguments().getString(EXTRA_POWER_USAGE_PERCENT)));
}
}
private void onCreateForTriState(String packageName) {
mUnrestrictedPreference = findPreference(KEY_PREF_UNRESTRICTED);
mOptimizePreference = findPreference(KEY_PREF_OPTIMIZED);
@@ -499,7 +513,6 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
mBatteryOptimizeUtils = new BatteryOptimizeUtils(
getContext(), getArguments().getInt(EXTRA_UID), packageName);
mOptimizationMode = mBatteryOptimizeUtils.getAppOptimizationMode();
}
private int getSelectedPreference() {

39
tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
View File

@@ -792,14 +792,39 @@ public class AdvancedPowerUsageDetailTest {
assertThat(mOptimizePreference.isChecked()).isTrue();
assertThat(mRestrictedPreference.isChecked()).isFalse();
assertThat(mUnrestrictedPreference.isChecked()).isFalse();
}
@Test
public void testOnPause_optimizationModeChanged_logPreference() {
final int mode = BatteryOptimizeUtils.MODE_RESTRICTED;
mFragment.mOptimizationMode = mode;
when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(mode);
mOptimizePreference.setKey(KEY_PREF_OPTIMIZED);
mFragment.onRadioButtonClicked(mOptimizePreference);
mFragment.onPause();
verify(mMetricsFeatureProvider)
.action(
mContext,
SettingsEnums.ACTION_APP_BATTERY_USAGE_OPTIMIZED,
(Pair<Integer, Object>[]) new Pair[] {
new Pair(ConvertUtils.METRIC_KEY_PACKAGE, null),
new Pair(ConvertUtils.METRIC_KEY_BATTERY_USAGE, "app label")
});
.action(
mContext,
SettingsEnums.ACTION_APP_BATTERY_USAGE_OPTIMIZED,
(Pair<Integer, Object>[]) new Pair[] {
new Pair(ConvertUtils.METRIC_KEY_PACKAGE, null),
new Pair(ConvertUtils.METRIC_KEY_BATTERY_USAGE, "app label")
});
}
@Test
public void testOnPause_optimizationModeIsNotChanged_notInvokeLogging() {
final int mode = BatteryOptimizeUtils.MODE_OPTIMIZED;
mFragment.mOptimizationMode = mode;
when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(mode);
mOptimizePreference.setKey(KEY_PREF_OPTIMIZED);
mFragment.onRadioButtonClicked(mOptimizePreference);
mFragment.onPause();
verifyZeroInteractions(mMetricsFeatureProvider);
}
@Test