drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Migrate off timeFormat12 and timeFormat24."

Browse Source
This commit is contained in:
Elliott Hughes
2014-10-23 18:21:56 +00:00
committed by Gerrit Code Review
parent 2bf3800b10 f7d5e0a53e
commit ced7ebdb1d
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/text/format/DateFormat.java
View File

@ -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;
}
/**

8
core/java/android/widget/TextClock.java
View File

@ -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;