Display the chart levels data into BatteryHistoryPreference

Bug: 184807417
Bug: 180607918
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I78718a59671ca6775abc725432fbfbec6c0993fe
This commit is contained in:
ykhung
2021-04-09 17:40:40 +08:00
committed by YUKAI HUNG
parent 9b226a4ff0
commit 740ac9a047
5 changed files with 136 additions and 15 deletions

View File

@@ -69,6 +69,7 @@ public class PowerUsageAdvanced extends PowerUsageBase {
if (!mIsChartGraphEnabled) {
removePreference(KEY_BATTERY_GRAPH);
}
setBatteryChartPreferenceController();
}
@Override
@@ -101,10 +102,10 @@ public class PowerUsageAdvanced extends PowerUsageBase {
// Creates based on the chart design is enabled or not.
if (mIsChartGraphEnabled) {
mBatteryChartPreferenceController =
new BatteryChartPreferenceController(context,
KEY_BATTERY_GRAPH, KEY_APP_LIST,
new BatteryChartPreferenceController(context, KEY_APP_LIST,
getSettingsLifecycle(), (SettingsActivity) getActivity(), this);
controllers.add(mBatteryChartPreferenceController);
setBatteryChartPreferenceController();
} else {
mBatteryAppListPreferenceController =
new BatteryAppListPreferenceController(context, KEY_APP_LIST,
@@ -131,7 +132,7 @@ public class PowerUsageAdvanced extends PowerUsageBase {
mBatteryUsageStats, /* showAllApps */true);
}
if (mBatteryChartPreferenceController != null && mBatteryHistoryMap != null) {
mBatteryChartPreferenceController.refreshUi(mBatteryHistoryMap);
mBatteryChartPreferenceController.setBatteryHistoryMap(mBatteryHistoryMap);
}
}
@@ -156,6 +157,12 @@ public class PowerUsageAdvanced extends PowerUsageBase {
}
}
private void setBatteryChartPreferenceController() {
if (mHistPref != null && mBatteryChartPreferenceController != null) {
mHistPref.setChartPreferenceController(mBatteryChartPreferenceController);
}
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override