Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24."

Browse Source 
* commit 'ced7ebdb1d522b4206e2048b278554ca841aeaba':
  Migrate off timeFormat12 and timeFormat24.
This commit is contained in:
Elliott Hughes
2014-10-28 04:39:24 +00:00
committed by Android Git Automerger
parent 9d9aac4cac ced7ebdb1d
commit 87ce99ca72
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

@@ -226,10 +226,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;
}
}
@@ -433,9 +433,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;

2
packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java
View File

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