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

Commit b1726776 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Update "Phone idle" subtext" into oc-dev am: 3a1d6db0 am: 85950d5e"

parents 6502eba7 5c396017

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

+2 −2
Original line number Diff line number Diff line
@@ -289,8 +289,8 @@ public class PowerUsageAdvanced extends PowerUsageBase { 
        if (usageData.usageList.size() <= 1) {

            CharSequence timeSequence = Utils.formatElapsedTime(getContext(),

                    usageData.totalUsageTimeMs, false);

            usageData.summary = TextUtils.expandTemplate(getText(R.string.battery_used_for),

                    timeSequence);

            usageData.summary = usageData.usageType == UsageType.IDLE ? timeSequence

                    : TextUtils.expandTemplate(getText(R.string.battery_used_for), timeSequence);

        } else {

            BatterySipper sipper = findBatterySipperWithMaxBatteryUsage(usageData.usageList);

            BatteryEntry batteryEntry = new BatteryEntry(getContext(), mHandler, mUserManager,

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

+10 −0
Original line number Diff line number Diff line
@@ -188,6 +188,16 @@ public class PowerUsageAdvancedTest { 
        assertThat(mPowerUsageData.summary.toString()).isEqualTo(expectedSummary);

    }



    @Test

    public void testUpdateUsageDataSummary_typeIdle_showUsageTime() {

        mPowerUsageData.usageType = UsageType.IDLE;

        mPowerUsageData.usageList.add(mNormalBatterySipper);



        mPowerUsageAdvanced.updateUsageDataSummary(mPowerUsageData, TOTAL_POWER, DISCHARGE_AMOUNT);



        assertThat(mPowerUsageData.summary.toString()).isEqualTo("0m");

    }



    @Test

    public void testUpdateUsageDataSummary_moreThanOneApp_showMaxUsageApp() {

        mPowerUsageData.usageList.add(mNormalBatterySipper);