Commit edc4781c authored Sep 19, 2014 by Alan Viverette Committed by Android Git Automerger Sep 19, 2014

am 49e308c8: am 609378ca: am 594373d1: am cf5ba66c: am 40994e66: Merge "Fix...

am 49e308c8: am 609378ca: am 594373d1: am cf5ba66c: am 40994e66: Merge "Fix radial time picker inner circle (1-12) selections" into lmp-dev

* commit '49e308c841c35ac385d3b5a5908d1540d7851ced':
  Fix radial time picker inner circle (1-12) selections

parents aced265e 8acb6abe

core/java/android/widget/RadialTimePickerView.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -557,7 +557,7 @@ public class RadialTimePickerView extends View implements View.OnTouchListener {
		if (mIsOnInnerCircle && hour == 0) {
		// Inner circle is 1 through 12.
		hour = 12;
		} else if (hour != 0) {
		} else if (!mIsOnInnerCircle && hour != 0) {
		// Outer circle is 13 through 23 and 0.
		hour += 12;
		}