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

Commit 8be6bc9b authored by Julia Reynolds's avatar Julia Reynolds Committed by Android Git Automerger
Browse files

am 3337693c: am 593aca12: Merge "Support 24 clock displays in demo mode." into mnc-dev 

* commit '3337693c':
  Support 24 clock displays in demo mode.
parents b1f78ba8 3337693c

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