Merge "Update "Phone idle" subtext" into oc-dev am: 3a1d6db0e7

am: 85950d5ebd Change-Id: I0d3d67b274242f72fa46c157c7cee883a476a2e2
2017-05-04 01:28:37 +00:00
parent f791573f95 85950d5ebd
commit 5c39601738
2 changed files with 12 additions and 2 deletions
--- a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
@@ -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,