Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aadee099 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents d52c4482 0b6a3bc9

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

+2 −1
Original line number Diff line number Diff line
@@ -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

tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java

+9 −2
Original line number Diff line number Diff line
@@ -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();

    }