From b9e8cfa5d3f6351defddcdf1a36f9dc0e88b8217 Mon Sep 17 00:00:00 2001 From: Salvador Martinez Date: Thu, 5 Apr 2018 11:05:40 -0700 Subject: [PATCH] Update battery strings to respect user 24 hour setting ICU on android doesn't respect users 24 hour setting by default. This CL makes it so that tell ICU what the users setting is so that it will respect it. Test: robotests updated Bug: 77483888 Change-Id: I46eec2a10530b8b490f6a681c3a9b0a9dd4d68bd --- packages/SettingsLib/src/com/android/settingslib/utils/PowerUtil.java | 3 ++- .../robotests/src/com/android/settingslib/utils/PowerUtilTest.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/utils/PowerUtil.java b/packages/SettingsLib/src/com/android/settingslib/utils/PowerUtil.java index 8b3da3944088..de29030f5a46 100644 --- a/packages/SettingsLib/src/com/android/settingslib/utils/PowerUtil.java +++ b/packages/SettingsLib/src/com/android/settingslib/utils/PowerUtil.java @@ -144,7 +144,8 @@ public class PowerUtil { FIFTEEN_MINUTES_MILLIS); // convert the time to a properly formatted string. - DateFormat fmt = DateFormat.getTimeInstance(DateFormat.SHORT); + String skeleton = android.text.format.DateFormat.getTimeFormatString(context); + DateFormat fmt = DateFormat.getInstanceForSkeleton(skeleton); Date date = Date.from(Instant.ofEpochMilli(roundedTimeOfDayMs)); CharSequence timeString = fmt.format(date); diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/PowerUtilTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/PowerUtilTest.java index 05247ba37382..dfd48cc99894 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/PowerUtilTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/PowerUtilTest.java @@ -42,8 +42,8 @@ public class PowerUtilTest { public static final long THIRTY_HOURS_MILLIS = Duration.ofHours(30).toMillis(); public static final String NORMAL_CASE_EXPECTED_PREFIX = "Should last until about"; public static final String ENHANCED_SUFFIX = " based on your usage"; - // matches a time (ex: '1:15 PM', '2 AM') - public static final String TIME_OF_DAY_REGEX = " (\\d)+:?(\\d)* (AM)|(PM)"; + // matches a time (ex: '1:15 PM', '2 AM', '23:00') + public static final String TIME_OF_DAY_REGEX = " (\\d)+:?(\\d)* ((AM)*)|((PM)*)"; // matches a percentage with parenthesis (ex: '(10%)') public static final String PERCENTAGE_REGEX = " \\(\\d?\\d%\\)"; -- 2.11.0