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

Commit 92fceaff authored by jackqdyulei's avatar jackqdyulei
Browse files

Hide summary for Cell in PowerUsageAdvanced 

1. Add method "shouldHideSummary" to check it
2. Also change method "shouldHide" to "shouldHideCategory",
to distinguish it from shouldHideSummary

Fix: 37293815
Test: RunSettingsRoboTests
Change-Id: I4364d0331f3aac143fad9ebdeab52207f5cb98bf
parent 66871d85

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

+12 −2
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ public class PowerUsageAdvanced extends PowerUsageBase { 
        mUsageListGroup.removeAll();

        for (int i = 0, size = dataList.size(); i < size; i++) {

            final PowerUsageData batteryData = dataList.get(i);

            if (shouldHide(batteryData)) {

            if (shouldHideCategory(batteryData)) {

                continue;

            }

            final PowerGaugePreference pref = new PowerGaugePreference(getPrefContext());
@@ -217,7 +217,7 @@ public class PowerUsageAdvanced extends PowerUsageBase { 
    }



    @VisibleForTesting

    boolean shouldHide(PowerUsageData powerUsageData) {

    boolean shouldHideCategory(PowerUsageData powerUsageData) {

        if (powerUsageData.usageType == UsageType.UNACCOUNTED

                || powerUsageData.usageType == UsageType.OVERCOUNTED) {

            return true;
@@ -264,6 +264,9 @@ public class PowerUsageAdvanced extends PowerUsageBase { 


    @VisibleForTesting

    void updateUsageDataSummary(PowerUsageData usageData, double totalPower, int dischargeAmount) {

        if (shouldHideSummary(usageData)) {

            return;

        }

        if (usageData.usageList.size() <= 1) {

            usageData.summary = getString(R.string.battery_used_for,

                    Utils.formatElapsedTime(getContext(), usageData.totalUsageTimeMs, false));
@@ -277,6 +280,13 @@ public class PowerUsageAdvanced extends PowerUsageBase { 
        }

    }



    @VisibleForTesting

    boolean shouldHideSummary(PowerUsageData powerUsageData) {

        @UsageType final int usageType = powerUsageData.usageType;



        return usageType == UsageType.CELL;

    }



    @VisibleForTesting

    BatterySipper findBatterySipperWithMaxBatteryUsage(List<BatterySipper> usageList) {

        BatterySipper sipper = usageList.get(0);

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

+19 −5
Original line number Diff line number Diff line
@@ -228,22 +228,36 @@ public class PowerUsageAdvancedTest { 
    public void testShouldHide_typeUnAccounted_returnTrue() {

        mPowerUsageData.usageType = UsageType.UNACCOUNTED;



        assertThat(mPowerUsageAdvanced.shouldHide(mPowerUsageData)).isTrue();

        assertThat(mPowerUsageAdvanced.shouldHideCategory(mPowerUsageData)).isTrue();

    }





    @Test

    public void testShouldHide_typeOverCounted_returnTrue() {

    public void testShouldHideCategory_typeOverCounted_returnTrue() {

        mPowerUsageData.usageType = UsageType.OVERCOUNTED;



        assertThat(mPowerUsageAdvanced.shouldHide(mPowerUsageData)).isTrue();

        assertThat(mPowerUsageAdvanced.shouldHideCategory(mPowerUsageData)).isTrue();

    }



    @Test

    public void testShouldHideCategory_typeNormal_returnFalse() {

        mPowerUsageData.usageType = UsageType.APP;



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

    }



    @Test

    public void testShouldHide_typeNormal_returnFalse() {

    public void testShouldHideSummary_typeCell_returnTrue() {

        mPowerUsageData.usageType = UsageType.CELL;



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

    }



    @Test

    public void testShouldHideSummary_typeNormal_returnFalse() {

        mPowerUsageData.usageType = UsageType.APP;



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

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

    }



}