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

Merge "Hide the summary for app in PowerUsageAdvanced" into oc-dr1-dev am: d6df3b3d00

Browse Source 
am: cbdaa2b56a

Change-Id: I1c260f3d1d089ae46ddba08dfc83063085ecbe42
This commit is contained in:
jackqdyulei
2017-06-28 18:01:17 +00:00
committed by android-build-merger
parent 95a0bd4ca2 cbdaa2b56a
commit c67694686f
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -319,7 +319,8 @@ public class PowerUsageAdvanced extends PowerUsageBase {
return usageType == UsageType.CELL return usageType == UsageType.CELL
|| usageType == UsageType.BLUETOOTH || usageType == UsageType.BLUETOOTH
|| usageType == UsageType.WIFI; || usageType == UsageType.WIFI
|| usageType == UsageType.APP;
} }
@VisibleForTesting @VisibleForTesting

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

@@ -121,7 +121,7 @@ public class PowerUsageAdvancedTest {
mPowerUsageAdvanced.setUserManager(mUserManager); mPowerUsageAdvanced.setUserManager(mUserManager);
mPowerUsageAdvanced.setBatteryUtils(BatteryUtils.getInstance(mShadowContext)); mPowerUsageAdvanced.setBatteryUtils(BatteryUtils.getInstance(mShadowContext));
mPowerUsageData = new PowerUsageData(UsageType.APP); mPowerUsageData = new PowerUsageData(UsageType.SYSTEM);
mMaxBatterySipper.totalPowerMah = TYPE_BLUETOOTH_USAGE; mMaxBatterySipper.totalPowerMah = TYPE_BLUETOOTH_USAGE;
mMaxBatterySipper.drainType = DrainType.BLUETOOTH; mMaxBatterySipper.drainType = DrainType.BLUETOOTH;
mNormalBatterySipper.drainType = DrainType.SCREEN; mNormalBatterySipper.drainType = DrainType.SCREEN;
@@ -326,9 +326,16 @@ public class PowerUsageAdvancedTest {
} }
@Test @Test
public void testShouldHideSummary_typeNormal_returnFalse() { public void testShouldHideSummary_typeApp_returnTrue() {
mPowerUsageData.usageType = UsageType.APP; mPowerUsageData.usageType = UsageType.APP;
assertThat(mPowerUsageAdvanced.shouldHideSummary(mPowerUsageData)).isTrue();
}
@Test
public void testShouldHideSummary_typeNormal_returnFalse() {
mPowerUsageData.usageType = UsageType.SYSTEM;
assertThat(mPowerUsageAdvanced.shouldHideSummary(mPowerUsageData)).isFalse(); assertThat(mPowerUsageAdvanced.shouldHideSummary(mPowerUsageData)).isFalse();
} }