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

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

Merge "Update summary for "Voice Calls"" into oc-dr1-dev

parents fbd8d215 85e771da

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

+5 −2
Original line number Diff line number Diff line
@@ -717,8 +717,11 @@ public class PowerUsageSummary extends PowerUsageBase implements 
        if (usageTimeMs >= DateUtils.MINUTE_IN_MILLIS) {

            final CharSequence timeSequence = Utils.formatElapsedTime(getContext(), usageTimeMs,

                    false);

            preference.setSummary(mBatteryUtils.shouldHideSipper(sipper) ? timeSequence :

                    TextUtils.expandTemplate(getText(R.string.battery_screen_usage), timeSequence));

            preference.setSummary(

                    (sipper.drainType != DrainType.APP || mBatteryUtils.shouldHideSipper(sipper))

                            ? timeSequence

                            : TextUtils.expandTemplate(getText(R.string.battery_screen_usage),

                                    timeSequence));

        }

    }

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

+13 −4
Original line number Diff line number Diff line
@@ -335,11 +335,10 @@ public class PowerUsageSummaryTest { 
        doReturn(mRealContext.getText(R.string.battery_screen_usage)).when(mFragment).getText(

                R.string.battery_screen_usage);

        doReturn(mRealContext).when(mFragment).getContext();

        final String expectedSummary = "Screen usage 2m";



        mFragment.setUsageSummary(mPreference, mNormalBatterySipper);



        assertThat(mPreference.getSummary().toString()).isEqualTo(expectedSummary);

        assertThat(mPreference.getSummary().toString()).isEqualTo("Screen usage 2m");

    }



    @Test
@@ -347,11 +346,21 @@ public class PowerUsageSummaryTest { 
        mNormalBatterySipper.usageTimeMs = 2 * DateUtils.MINUTE_IN_MILLIS;

        doReturn(true).when(mFragment.mBatteryUtils).shouldHideSipper(mNormalBatterySipper);

        doReturn(mRealContext).when(mFragment).getContext();

        final String expectedSummary = "2m";



        mFragment.setUsageSummary(mPreference, mNormalBatterySipper);



        assertThat(mPreference.getSummary().toString()).isEqualTo(expectedSummary);

        assertThat(mPreference.getSummary().toString()).isEqualTo("2m");

    }



    @Test

    public void testSetUsageSummary_timeMoreThanOneMinute_notApp_setUsedSummary() {

        mNormalBatterySipper.usageTimeMs = 2 * DateUtils.MINUTE_IN_MILLIS;

        mNormalBatterySipper.drainType = BatterySipper.DrainType.PHONE;

        doReturn(mRealContext).when(mFragment).getContext();



        mFragment.setUsageSummary(mPreference, mNormalBatterySipper);



        assertThat(mPreference.getSummary().toString()).isEqualTo("2m");

    }



    private void testToggleAllApps(final boolean isShowApps) {