Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 593aca12 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

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

parents 5fe22e4f c11d838b

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

+7 −1
Original line number Diff line number Diff line
@@ -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));

                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());