Merge "Don't show Screen as Apps in advanced battery page" into oc-dev am: 89bc5b2bff (445961d0) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/fuelgauge/PowerUsageAdvanced.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -226,6 +226,11 @@ public class PowerUsageAdvanced extends PowerUsageBase {
		return false;
		}

		@VisibleForTesting
		boolean shouldShowBatterySipper(BatterySipper batterySipper) {
		return batterySipper.drainType != DrainType.SCREEN;
		}

		@VisibleForTesting
		List<PowerUsageData> parsePowerUsageData(BatteryStatsHelper statusHelper) {
		final List<BatterySipper> batterySippers = statusHelper.getUsageList();
		@@ -245,8 +250,10 @@ public class PowerUsageAdvanced extends PowerUsageBase {
		BatteryUtils.StatusType.FOREGROUND, sipper.uidObj, STATUS_TYPE);
		}
		usageData.totalUsageTimeMs += sipper.usageTimeMs;
		if (shouldShowBatterySipper(sipper)) {
		usageData.usageList.add(sipper);
		}
		}

		final List<PowerUsageData> batteryDataList = new ArrayList<>(batteryDataMap.values());
		final int dischargeAmount = statusHelper.getStats().getDischargeAmount(STATUS_TYPE);

+14 −0

Original line number	Diff line number	Diff line
		@@ -260,4 +260,18 @@ public class PowerUsageAdvancedTest {
		assertThat(mPowerUsageAdvanced.shouldHideSummary(mPowerUsageData)).isFalse();
		}

		@Test
		public void testShouldShowBatterySipper_typeScreen_returnFalse() {
		mNormalBatterySipper.drainType = DrainType.SCREEN;

		assertThat(mPowerUsageAdvanced.shouldShowBatterySipper(mNormalBatterySipper)).isFalse();
		}

		@Test
		public void testShouldShowBatterySipper_typeNormal_returnTrue() {
		mNormalBatterySipper.drainType = DrainType.APP;

		assertThat(mPowerUsageAdvanced.shouldShowBatterySipper(mNormalBatterySipper)).isTrue();
		}

		}