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

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

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

parents 451b7edf 13e3ab28

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

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

+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();

    }