summaryrefslogtreecommitdiffstats
path: root/core/java/android/widget/RadialTimePickerView.java
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2014-07-24 20:13:56 -0700
committerFabrice Di Meglio <fdimeglio@google.com>2014-07-25 18:06:25 +0000
commit3fbad42a4b315827df8159fcb74b78ef055aa3ef (patch)
treeed4ef988e055cabc2ee201aebb95c422a495dfe8 /core/java/android/widget/RadialTimePickerView.java
parent8470857ee43444868a38d0e760981386880d6ce2 (diff)
downloadframeworks_base-3fbad42a4b315827df8159fcb74b78ef055aa3ef.zip
frameworks_base-3fbad42a4b315827df8159fcb74b78ef055aa3ef.tar.gz
frameworks_base-3fbad42a4b315827df8159fcb74b78ef055aa3ef.tar.bz2
Fix bug #16307124 Not able to select hour 12 in TimePicker with 24-hour time enabled
- ahhh modulo ... Change-Id: Ief08594590480bfcecc09cad1f782e57b05d9786
Diffstat (limited to 'core/java/android/widget/RadialTimePickerView.java')
-rw-r--r--core/java/android/widget/RadialTimePickerView.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/widget/RadialTimePickerView.java b/core/java/android/widget/RadialTimePickerView.java
index 9b763c1..1e30bfa 100644
--- a/core/java/android/widget/RadialTimePickerView.java
+++ b/core/java/android/widget/RadialTimePickerView.java
@@ -518,6 +518,9 @@ public class RadialTimePickerView extends View implements View.OnTouchListener {
if (mIs24HourMode) {
if (mIsOnInnerCircle) {
hours = hours % 12;
+ if (hours == 0) {
+ hours = 12;
+ }
} else {
if (hours != 0) {
hours += 12;