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

Merge "Hide summary for type system" into oc-mr1-dev

Browse Source 
am: aadee0997c

Change-Id: I99a8cfefe4253ee223b91d2a3e0b9e7721e73ee4
This commit is contained in:
jackqdyulei
2017-09-28 02:17:08 +00:00
committed by android-build-merger
parent eccb0fcff9 aadee0997c
commit da9247d645
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

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

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

@@ -133,7 +133,7 @@ public class PowerUsageAdvancedTest {
when(mShadowContext.getSystemService(Context.CONNECTIVITY_SERVICE)).thenReturn(
mConnectivityManager);
mPowerUsageData = new PowerUsageData(UsageType.SYSTEM);
mPowerUsageData = new PowerUsageData(UsageType.USER);
mMaxBatterySipper.totalPowerMah = TYPE_BLUETOOTH_USAGE;
mMaxBatterySipper.drainType = DrainType.BLUETOOTH;
mNormalBatterySipper.drainType = DrainType.SCREEN;
@@ -341,6 +341,13 @@ public class PowerUsageAdvancedTest {
assertThat(mPowerUsageAdvanced.shouldHideSummary(mPowerUsageData)).isTrue();
}
@Test
public void testShouldHideSummary_typeSystem_returnTrue() {
mPowerUsageData.usageType = UsageType.SYSTEM;
assertThat(mPowerUsageAdvanced.shouldHideSummary(mPowerUsageData)).isTrue();
}
@Test
public void testShouldHideSummary_typeWifi_returnTrue() {
mPowerUsageData.usageType = UsageType.WIFI;
@@ -364,7 +371,7 @@ public class PowerUsageAdvancedTest {
@Test
public void testShouldHideSummary_typeNormal_returnFalse() {
mPowerUsageData.usageType = UsageType.SYSTEM;
mPowerUsageData.usageType = UsageType.IDLE;
assertThat(mPowerUsageAdvanced.shouldHideSummary(mPowerUsageData)).isFalse();
}