From 85e771da781cd1a52ba55a6140806461e32bfa9b Mon Sep 17 00:00:00 2001 From: jackqdyulei Date: Fri, 7 Jul 2017 13:05:46 -0700 Subject: [PATCH] Update summary for "Voice Calls" Change it from "Screen usage 2m" to "2m", since this is not a screen usage. This cl has effect on all non-app batterySipper. Bug: 63443732 Test: RunSettingsRoboTests Change-Id: I027b3234bd7b56738ab31c5dfbc0d8bd7f19186e --- .../settings/fuelgauge/PowerUsageSummary.java | 7 +++++-- .../fuelgauge/PowerUsageSummaryTest.java | 17 +++++++++++++---- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java index 3ad014297cb..9aa1f170ae4 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java +++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java @@ -710,8 +710,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)); } } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java index eb22d22fd20..b53b98d0e6f 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java @@ -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) {