diff --git a/res/values/strings.xml b/res/values/strings.xml index 98462db2b0c..83698eb8e79 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5301,6 +5301,10 @@ Battery usage data will be available in a few hours once fully charged now + + %1$s - %2$s + + %1$s %2$s Battery usage chart diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java index d9ac14ef180..f13a4ef6d7d 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java @@ -440,7 +440,8 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll return selectedHourText; } - return String.format("%s %s", selectedDayText, selectedHourText); + return mContext.getString( + R.string.battery_usage_day_and_hour, selectedDayText, selectedHourText); } private String getAccessibilityAnnounceMessage() { @@ -666,8 +667,8 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll } return index == timestamps.size() - 1 ? generateText(timestamps, index) - : String.format("%s%s%s", generateText(timestamps, index), - mIs24HourFormat ? "-" : " - ", generateText(timestamps, index + 1)); + : mContext.getString(R.string.battery_usage_timestamps_hyphen, + generateText(timestamps, index), generateText(timestamps, index + 1)); } public HourlyChartLabelTextGenerator setLatestTimestamp(Long latestTimestamp) {