diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-06-10 20:20:52 -0700 |
|---|---|---|
| committer | Fabrice Di Meglio <fdimeglio@google.com> | 2014-06-10 20:26:42 -0700 |
| commit | a7a62c5b66189f114a8ad41c53bbe0bb00ae1e90 (patch) | |
| tree | ac173ba22e4517549327f92f9ed1f6c7cee508ca /res | |
| parent | da8babaedf45caf55eb77320f0c3ea873d195c4d (diff) | |
| download | packages_apps_Settings-a7a62c5b66189f114a8ad41c53bbe0bb00ae1e90.tar.gz packages_apps_Settings-a7a62c5b66189f114a8ad41c53bbe0bb00ae1e90.tar.bz2 packages_apps_Settings-a7a62c5b66189f114a8ad41c53bbe0bb00ae1e90.zip | |
Fix bug #15545573 Battery use chart is incorrect for date labels and time axis labels
- use DateFormat.getBestDateTimePattern(...) to get the best Date and Time format
depending on the Locale
- format the label according to the best format
- remove non needed formatting strings
Change-Id: I78b62b9a7c9401e47e62c7161214636bb43324fc
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index fd25212f9..d5cb89a75 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3565,16 +3565,6 @@ <string name="battery_stats_phone_signal_label">Mobile network signal</string> <!-- Battery usage during last unplugged period --> <string name="battery_stats_last_duration">@string/menu_stats_last_unplugged</string> - <!-- [CHAR_LIMIT=5] Label for an hour time when using 24 hour mode --> - <string name="battery_stats_hour_24_label"><xliff:g id="time">%1$d</xliff:g>:00</string> - <!-- [CHAR_LIMIT=5] Label for an hour time when using 12 hour mode in the AM --> - <string name="battery_stats_hour_am_label"><xliff:g id="time">%1$d</xliff:g> AM</string> - <!-- [CHAR_LIMIT=5] Label for an hour time when using 12 hour mode in the PM --> - <string name="battery_stats_hour_pm_label"><xliff:g id="time">%1$d</xliff:g> PM</string> - <!-- [CHAR_LIMIT=3] Label for date of day and month (not year) when the day is shown first --> - <string name="battery_stats_date_day_first_label"><xliff:g id="day">%1$d</xliff:g>/<xliff:g id="month">%2$d</xliff:g></string> - <!-- [CHAR_LIMIT=3] Label for date of day and month (not year) when the month is shown first --> - <string name="battery_stats_date_month_first_label"><xliff:g id="month">%2$d</xliff:g>/<xliff:g id="day">%1$d</xliff:g></string> <!-- CPU awake time title --> <string name="awake">Device awake time</string> <!-- Wifi on time --> |