Merge "Set advanced battery usage items as non-selectable" into oc-dev

This commit is contained in:
Antony Sargent
2017-06-09 15:41:25 +00:00
committed by Android (Google) Code Review
2 changed files with 38 additions and 17 deletions

View File

@@ -168,11 +168,16 @@ public class PowerUsageAdvanced extends PowerUsageBase {
if (context == null) {
return;
}
updatePreference(mHistPref);
refreshPowerUsageDataList(mStatsHelper, mUsageListGroup);
BatteryEntry.startRequestQueue();
}
List<PowerUsageData> dataList = parsePowerUsageData(mStatsHelper);
mUsageListGroup.removeAll();
@VisibleForTesting
void refreshPowerUsageDataList(BatteryStatsHelper statsHelper,
PreferenceGroup preferenceGroup) {
List<PowerUsageData> dataList = parsePowerUsageData(statsHelper);
preferenceGroup.removeAll();
for (int i = 0, size = dataList.size(); i < size; i++) {
final PowerUsageData batteryData = dataList.get(i);
if (shouldHideCategory(batteryData)) {
@@ -184,10 +189,9 @@ public class PowerUsageAdvanced extends PowerUsageBase {
pref.setTitle(batteryData.titleResId);
pref.setSummary(batteryData.summary);
pref.setPercent(batteryData.percentage);
mUsageListGroup.addPreference(pref);
pref.setSelectable(false);
preferenceGroup.addPreference(pref);
}
BatteryEntry.startRequestQueue();
}
@VisibleForTesting