Merge "Add screen usage string for battery settings" into oc-dev am: 28cf04d994

am: 3ab2ca5cc9 Change-Id: Iaca27db0a637de88c09a45d88f35db258783fa16
2017-05-18 19:35:27 +00:00
parent 8311e26aba 3ab2ca5cc9
commit b5219ba29a
3 changed files with 6 additions and 4 deletions
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -760,7 +760,7 @@ public class PowerUsageSummary extends PowerUsageBase implements
            final CharSequence timeSequence = Utils.formatElapsedTime(getContext(), usageTimeMs,
                    false);
            preference.setSummary(
-                    TextUtils.expandTemplate(getText(R.string.battery_used_for), timeSequence));
+                    TextUtils.expandTemplate(getText(R.string.battery_screen_usage), timeSequence));
        }
    }