diff options
| author | Elliott Hughes <enh@google.com> | 2014-10-23 11:06:43 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-10-23 11:18:21 -0700 |
| commit | f7d5e0a53e168f2acc17b098bdd4b927fa1b1d6c (patch) | |
| tree | a0c53d014dfc466d17e20ad33a9bceffd802369d /core/java/android/text/format | |
| parent | 0451728645d559d904f579894d4b59e971e2369e (diff) | |
| download | frameworks_base-f7d5e0a53e168f2acc17b098bdd4b927fa1b1d6c.zip frameworks_base-f7d5e0a53e168f2acc17b098bdd4b927fa1b1d6c.tar.gz frameworks_base-f7d5e0a53e168f2acc17b098bdd4b927fa1b1d6c.tar.bz2 | |
Migrate off timeFormat12 and timeFormat24.
libcore now offers a wider variety of 12-/24-hour time formats,
so be more specific about which one we want here.
(cherry-pick of 85f60d3a03b5b5d9a0e8b8a138eb85a6b53a1eca.)
Bug: 10361358
Change-Id: I846ab7a6f84cd49e876ad21e9366aff1600e0530
Diffstat (limited to 'core/java/android/text/format')
| -rwxr-xr-x | core/java/android/text/format/DateFormat.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/text/format/DateFormat.java b/core/java/android/text/format/DateFormat.java index 9fec9a1..d48f551 100755 --- a/core/java/android/text/format/DateFormat.java +++ b/core/java/android/text/format/DateFormat.java @@ -216,7 +216,7 @@ public class DateFormat { */ public static String getTimeFormatString(Context context) { LocaleData d = LocaleData.get(context.getResources().getConfiguration().locale); - return is24HourFormat(context) ? d.timeFormat24 : d.timeFormat12; + return is24HourFormat(context) ? d.timeFormat_Hm : d.timeFormat_hm; } /** |