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

Merge "Hide summary for Cell in PowerUsageAdvanced" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-14 20:19:46 +00:00
committed by Android (Google) Code Review
parent 53ea5701f4 92fceaff22
commit b544d22b35
2 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
View File

@@ -172,7 +172,7 @@ public class PowerUsageAdvanced extends PowerUsageBase {
mUsageListGroup.removeAll(); mUsageListGroup.removeAll();
for (int i = 0, size = dataList.size(); i < size; i++) { for (int i = 0, size = dataList.size(); i < size; i++) {
final PowerUsageData batteryData = dataList.get(i); final PowerUsageData batteryData = dataList.get(i);
if (shouldHide(batteryData)) { if (shouldHideCategory(batteryData)) {
continue; continue;
} }
final PowerGaugePreference pref = new PowerGaugePreference(getPrefContext()); final PowerGaugePreference pref = new PowerGaugePreference(getPrefContext());
@@ -217,7 +217,7 @@ public class PowerUsageAdvanced extends PowerUsageBase {
} }
@VisibleForTesting @VisibleForTesting
boolean shouldHide(PowerUsageData powerUsageData) { boolean shouldHideCategory(PowerUsageData powerUsageData) {
if (powerUsageData.usageType == UsageType.UNACCOUNTED if (powerUsageData.usageType == UsageType.UNACCOUNTED
|| powerUsageData.usageType == UsageType.OVERCOUNTED) { || powerUsageData.usageType == UsageType.OVERCOUNTED) {
return true; return true;
@@ -264,6 +264,9 @@ public class PowerUsageAdvanced extends PowerUsageBase {
@VisibleForTesting @VisibleForTesting
void updateUsageDataSummary(PowerUsageData usageData, double totalPower, int dischargeAmount) { void updateUsageDataSummary(PowerUsageData usageData, double totalPower, int dischargeAmount) {
if (shouldHideSummary(usageData)) {
return;
}
if (usageData.usageList.size() <= 1) { if (usageData.usageList.size() <= 1) {
usageData.summary = getString(R.string.battery_used_for, usageData.summary = getString(R.string.battery_used_for,
Utils.formatElapsedTime(getContext(), usageData.totalUsageTimeMs, false)); Utils.formatElapsedTime(getContext(), usageData.totalUsageTimeMs, false));
@@ -277,6 +280,13 @@ public class PowerUsageAdvanced extends PowerUsageBase {
} }
} }
@VisibleForTesting
boolean shouldHideSummary(PowerUsageData powerUsageData) {
@UsageType final int usageType = powerUsageData.usageType;
return usageType == UsageType.CELL;
}
@VisibleForTesting @VisibleForTesting
BatterySipper findBatterySipperWithMaxBatteryUsage(List<BatterySipper> usageList) { BatterySipper findBatterySipperWithMaxBatteryUsage(List<BatterySipper> usageList) {
BatterySipper sipper = usageList.get(0); BatterySipper sipper = usageList.get(0);

26
tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
View File

@@ -228,22 +228,36 @@ public class PowerUsageAdvancedTest {
public void testShouldHide_typeUnAccounted_returnTrue() { public void testShouldHide_typeUnAccounted_returnTrue() {
mPowerUsageData.usageType = UsageType.UNACCOUNTED; mPowerUsageData.usageType = UsageType.UNACCOUNTED;
assertThat(mPowerUsageAdvanced.shouldHide(mPowerUsageData)).isTrue(); assertThat(mPowerUsageAdvanced.shouldHideCategory(mPowerUsageData)).isTrue();
} }
@Test @Test
public void testShouldHide_typeOverCounted_returnTrue() { public void testShouldHideCategory_typeOverCounted_returnTrue() {
mPowerUsageData.usageType = UsageType.OVERCOUNTED; mPowerUsageData.usageType = UsageType.OVERCOUNTED;
assertThat(mPowerUsageAdvanced.shouldHide(mPowerUsageData)).isTrue(); assertThat(mPowerUsageAdvanced.shouldHideCategory(mPowerUsageData)).isTrue();
} }
@Test @Test
public void testShouldHide_typeNormal_returnFalse() { public void testShouldHideCategory_typeNormal_returnFalse() {
mPowerUsageData.usageType = UsageType.APP; mPowerUsageData.usageType = UsageType.APP;
assertThat(mPowerUsageAdvanced.shouldHide(mPowerUsageData)).isFalse(); assertThat(mPowerUsageAdvanced.shouldHideCategory(mPowerUsageData)).isFalse();
} }
@Test
public void testShouldHideSummary_typeCell_returnTrue() {
mPowerUsageData.usageType = UsageType.CELL;
assertThat(mPowerUsageAdvanced.shouldHideSummary(mPowerUsageData)).isTrue();
}
@Test
public void testShouldHideSummary_typeNormal_returnFalse() {
mPowerUsageData.usageType = UsageType.APP;
assertThat(mPowerUsageAdvanced.shouldHideSummary(mPowerUsageData)).isFalse();
}
} }