diff options
| author | Elliott Hughes <enh@google.com> | 2014-10-23 18:21:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-23 18:21:56 +0000 |
| commit | ced7ebdb1d522b4206e2048b278554ca841aeaba (patch) | |
| tree | cf0b3f156304178e4204109bfec64d255d3d3ae9 | |
| parent | 2bf3800b10e1cc9a291527fc83efc986ba83aa37 (diff) | |
| parent | f7d5e0a53e168f2acc17b098bdd4b927fa1b1d6c (diff) | |
| download | frameworks_base-ced7ebdb1d522b4206e2048b278554ca841aeaba.zip frameworks_base-ced7ebdb1d522b4206e2048b278554ca841aeaba.tar.gz frameworks_base-ced7ebdb1d522b4206e2048b278554ca841aeaba.tar.bz2 | |
Merge "Migrate off timeFormat12 and timeFormat24."
| -rwxr-xr-x | core/java/android/text/format/DateFormat.java | 2 | ||||
| -rw-r--r-- | core/java/android/widget/TextClock.java | 8 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java | 2 |
3 files changed, 6 insertions, 6 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; } /** diff --git a/core/java/android/widget/TextClock.java b/core/java/android/widget/TextClock.java index b3b95d9..0a20eed 100644 --- a/core/java/android/widget/TextClock.java +++ b/core/java/android/widget/TextClock.java @@ -222,10 +222,10 @@ public class TextClock extends TextView { if (mFormat12 == null || mFormat24 == null) { LocaleData ld = LocaleData.get(getContext().getResources().getConfiguration().locale); if (mFormat12 == null) { - mFormat12 = ld.timeFormat12; + mFormat12 = ld.timeFormat_hm; } if (mFormat24 == null) { - mFormat24 = ld.timeFormat24; + mFormat24 = ld.timeFormat_Hm; } } @@ -429,9 +429,9 @@ public class TextClock extends TextView { LocaleData ld = LocaleData.get(getContext().getResources().getConfiguration().locale); if (format24Requested) { - mFormat = abc(mFormat24, mFormat12, ld.timeFormat24); + mFormat = abc(mFormat24, mFormat12, ld.timeFormat_Hm); } else { - mFormat = abc(mFormat12, mFormat24, ld.timeFormat12); + mFormat = abc(mFormat12, mFormat24, ld.timeFormat_hm); } boolean hadSeconds = mHasSeconds; 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 |