diff options
| author | Elliott Hughes <enh@google.com> | 2014-10-28 04:39:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-28 04:39:24 +0000 |
| commit | 87ce99ca7243e4556a6cfe9f42cc51531301e979 (patch) | |
| tree | befac656dd782e3f955f772a24e61be402d266e8 /packages/SystemUI/src/com/android/systemui/statusbar | |
| parent | 9d9aac4cacce75b4847aebce0f019250dc3b4e93 (diff) | |
| parent | ced7ebdb1d522b4206e2048b278554ca841aeaba (diff) | |
| download | frameworks_base-87ce99ca7243e4556a6cfe9f42cc51531301e979.zip frameworks_base-87ce99ca7243e4556a6cfe9f42cc51531301e979.tar.gz frameworks_base-87ce99ca7243e4556a6cfe9f42cc51531301e979.tar.bz2 | |
am ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24."
* commit 'ced7ebdb1d522b4206e2048b278554ca841aeaba':
Migrate off timeFormat12 and timeFormat24.
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 55a0bba..537bfb9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java @@ -149,7 +149,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 |