PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 69d6f2840f

Change-Id: Ie98286df2d583d521eefb30630bfb32936b5ac79
This commit is contained in:
jackqdyulei
2017-07-07 23:57:12 +00:00
committed by android-build-merger
parent 67fed2400d 69d6f2840f
commit d8b92b4d82
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/fuelgauge/PowerUsageSummary.java
View File

@@ -717,8 +717,11 @@ public class PowerUsageSummary extends PowerUsageBase implements
if (usageTimeMs >= DateUtils.MINUTE_IN_MILLIS) { if (usageTimeMs >= DateUtils.MINUTE_IN_MILLIS) {
final CharSequence timeSequence = Utils.formatElapsedTime(getContext(), usageTimeMs, final CharSequence timeSequence = Utils.formatElapsedTime(getContext(), usageTimeMs,
false); false);
preference.setSummary(mBatteryUtils.shouldHideSipper(sipper) ? timeSequence : preference.setSummary(
TextUtils.expandTemplate(getText(R.string.battery_screen_usage), timeSequence)); (sipper.drainType != DrainType.APP || mBatteryUtils.shouldHideSipper(sipper))
? timeSequence
: TextUtils.expandTemplate(getText(R.string.battery_screen_usage),
timeSequence));
} }
} }

17
tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
View File

@@ -335,11 +335,10 @@ public class PowerUsageSummaryTest {
doReturn(mRealContext.getText(R.string.battery_screen_usage)).when(mFragment).getText( doReturn(mRealContext.getText(R.string.battery_screen_usage)).when(mFragment).getText(
R.string.battery_screen_usage); R.string.battery_screen_usage);
doReturn(mRealContext).when(mFragment).getContext(); doReturn(mRealContext).when(mFragment).getContext();
final String expectedSummary = "Screen usage 2m";
mFragment.setUsageSummary(mPreference, mNormalBatterySipper); mFragment.setUsageSummary(mPreference, mNormalBatterySipper);
assertThat(mPreference.getSummary().toString()).isEqualTo(expectedSummary); assertThat(mPreference.getSummary().toString()).isEqualTo("Screen usage 2m");
} }
@Test @Test
@@ -347,11 +346,21 @@ public class PowerUsageSummaryTest {
mNormalBatterySipper.usageTimeMs = 2 * DateUtils.MINUTE_IN_MILLIS; mNormalBatterySipper.usageTimeMs = 2 * DateUtils.MINUTE_IN_MILLIS;
doReturn(true).when(mFragment.mBatteryUtils).shouldHideSipper(mNormalBatterySipper); doReturn(true).when(mFragment.mBatteryUtils).shouldHideSipper(mNormalBatterySipper);
doReturn(mRealContext).when(mFragment).getContext(); doReturn(mRealContext).when(mFragment).getContext();
final String expectedSummary = "2m";
mFragment.setUsageSummary(mPreference, mNormalBatterySipper); 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) { private void testToggleAllApps(final boolean isShowApps) {