Merge "Hide the summary for app in PowerUsageAdvanced" into oc-dr1-dev am: d6df3b3d00 (c6769468) · Commits · e / os / android_packages_apps_Settings

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -319,7 +319,8 @@ public class PowerUsageAdvanced extends PowerUsageBase {

		return usageType == UsageType.CELL
		\|\| usageType == UsageType.BLUETOOTH
		\|\| usageType == UsageType.WIFI;
		\|\| usageType == UsageType.WIFI
		\|\| usageType == UsageType.APP;
		}

		@VisibleForTesting

+9 −2

Original line number	Diff line number	Diff line
		@@ -121,7 +121,7 @@ public class PowerUsageAdvancedTest {
		mPowerUsageAdvanced.setUserManager(mUserManager);
		mPowerUsageAdvanced.setBatteryUtils(BatteryUtils.getInstance(mShadowContext));

		mPowerUsageData = new PowerUsageData(UsageType.APP);
		mPowerUsageData = new PowerUsageData(UsageType.SYSTEM);
		mMaxBatterySipper.totalPowerMah = TYPE_BLUETOOTH_USAGE;
		mMaxBatterySipper.drainType = DrainType.BLUETOOTH;
		mNormalBatterySipper.drainType = DrainType.SCREEN;
		@@ -326,9 +326,16 @@ public class PowerUsageAdvancedTest {
		}

		@Test
		public void testShouldHideSummary_typeNormal_returnFalse() {
		public void testShouldHideSummary_typeApp_returnTrue() {
		mPowerUsageData.usageType = UsageType.APP;

		assertThat(mPowerUsageAdvanced.shouldHideSummary(mPowerUsageData)).isTrue();
		}

		@Test
		public void testShouldHideSummary_typeNormal_returnFalse() {
		mPowerUsageData.usageType = UsageType.SYSTEM;

		assertThat(mPowerUsageAdvanced.shouldHideSummary(mPowerUsageData)).isFalse();
		}