Merge "Add Foreground Service time to battery usage" into oc-mr1-dev

2017-07-24 19:02:12 +00:00
parent 5e48ea193b 987711712c
commit a47a3f58bf
5 changed files with 82 additions and 42 deletions
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -714,7 +714,7 @@ public class PowerUsageSummary extends PowerUsageBase implements
            preference.setSummary(
                    (sipper.drainType != DrainType.APP || mBatteryUtils.shouldHideSipper(sipper))
                            ? timeSequence
-                            : TextUtils.expandTemplate(getText(R.string.battery_screen_usage),
+                            : TextUtils.expandTemplate(getText(R.string.battery_used_for),
                                    timeSequence));
        }
    }