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

Commit b9631251 authored by jackqdyulei's avatar jackqdyulei Committed by android-build-merger
Browse files

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

am: da9247d6

Change-Id: I440fcbfea0cf934e68737eb5314739e397d80d88
parents 9a3fd4f7 da9247d6

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
@@ -132,7 +132,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;
@@ -340,6 +340,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;
@@ -363,7 +370,7 @@ public class PowerUsageAdvancedTest { 


    @Test

    public void testShouldHideSummary_typeNormal_returnFalse() {

        mPowerUsageData.usageType = UsageType.SYSTEM;

        mPowerUsageData.usageType = UsageType.IDLE;



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

    }