Fix AM/PM visibility on clock

If a user enables one of the different AM/PM styles, we should switch to
12 hour strings, otherwise the options won't do anything.

Change-Id: Ie786a326961d17e81f1d5758ea291d3013e7a23d

parent b3ed44e0

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -157,7 +157,7 @@ public class Clock extends TextView {
		boolean b24 = DateFormat.is24HourFormat(context);
		int res;

		if (b24) {
		if (b24 && AM_PM_STYLE == AM_PM_STYLE_GONE) {
		res = R.string.twenty_four_hour_time_format;
		} else {
		res = R.string.twelve_hour_time_format;