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

Merge "Update "Phone idle" subtext" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-04 01:11:23 +00:00
committed by Android (Google) Code Review
parent eb6eb99a56 995ca362c9
commit 3a1d6db0e7
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
View File

@@ -289,8 +289,8 @@ public class PowerUsageAdvanced extends PowerUsageBase {
if (usageData.usageList.size() <= 1) { if (usageData.usageList.size() <= 1) {
CharSequence timeSequence = Utils.formatElapsedTime(getContext(), CharSequence timeSequence = Utils.formatElapsedTime(getContext(),
usageData.totalUsageTimeMs, false); usageData.totalUsageTimeMs, false);
usageData.summary = TextUtils.expandTemplate(getText(R.string.battery_used_for), usageData.summary = usageData.usageType == UsageType.IDLE ? timeSequence
timeSequence); : TextUtils.expandTemplate(getText(R.string.battery_used_for), timeSequence);
} else { } else {
BatterySipper sipper = findBatterySipperWithMaxBatteryUsage(usageData.usageList); BatterySipper sipper = findBatterySipperWithMaxBatteryUsage(usageData.usageList);
BatteryEntry batteryEntry = new BatteryEntry(getContext(), mHandler, mUserManager, BatteryEntry batteryEntry = new BatteryEntry(getContext(), mHandler, mUserManager,

10
tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
View File

@@ -188,6 +188,16 @@ public class PowerUsageAdvancedTest {
assertThat(mPowerUsageData.summary.toString()).isEqualTo(expectedSummary); 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 @Test
public void testUpdateUsageDataSummary_moreThanOneApp_showMaxUsageApp() { public void testUpdateUsageDataSummary_moreThanOneApp_showMaxUsageApp() {
mPowerUsageData.usageList.add(mNormalBatterySipper); mPowerUsageData.usageList.add(mNormalBatterySipper);