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

This commit is contained in:
TreeHugger Robot
2017-05-04 01:11:23 +00:00
committed by Android (Google) Code Review
2 changed files with 12 additions and 2 deletions

View File

@@ -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,