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 /packages/SystemUI/src/com/android/systemui/statusbar | |
| 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 'packages/SystemUI/src/com/android/systemui/statusbar')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java index 8ced1c9..6125d63 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java @@ -138,7 +138,7 @@ public class Clock extends TextView implements DemoMode { final char MAGIC2 = '\uEF01'; SimpleDateFormat sdf; - String format = is24 ? d.timeFormat24 : d.timeFormat12; + String format = is24 ? d.timeFormat_Hm : d.timeFormat_hm; if (!format.equals(mClockFormatString)) { /* * Search for an unquoted "a" in the format string, so we can |