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

Merge "Support 24 clock displays in demo mode." into mnc-dev

Browse Source
This commit is contained in:
Julia Reynolds
2015-07-17 15:54:03 +00:00
committed by Android (Google) Code Review
parent 5fe22e4fcb c11d838bc5
commit 593aca12c2
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -232,7 +232,13 @@ public class Clock extends TextView implements DemoMode {
} else if (hhmm != null && hhmm.length() == 4) {
int hh = Integer.parseInt(hhmm.substring(0, 2));
int mm = Integer.parseInt(hhmm.substring(2));
mCalendar.set(Calendar.HOUR, hh);
boolean is24 = DateFormat.is24HourFormat(
getContext(), ActivityManager.getCurrentUser());
if (is24) {
mCalendar.set(Calendar.HOUR_OF_DAY, hh);
} else {
mCalendar.set(Calendar.HOUR, hh);
}
mCalendar.set(Calendar.MINUTE, mm);
}
setText(getSmallTime());