summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-11-19 02:28:35 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-11-19 02:28:37 +0000
commita489f0b3d9007d94ba514bf4ce71ce9957147e33 (patch)
treee7f37010ea989ac76df3678980276b21515c1acd /core/java/android
parent9899b663f4c512e4a9acaa5508f0fd86bed6e476 (diff)
parent448ff718a0bb92c5b760668c12d2449a00f9aa2a (diff)
Merge "Re-initialize data when changing time picker 24-hour mode" into lmp-mr1-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/widget/RadialTimePickerView.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/widget/RadialTimePickerView.java b/core/java/android/widget/RadialTimePickerView.java
index 24fc2bb9a8d2..8b01dde16f54 100644
--- a/core/java/android/widget/RadialTimePickerView.java
+++ b/core/java/android/widget/RadialTimePickerView.java
@@ -452,7 +452,10 @@ public class RadialTimePickerView extends View implements View.OnTouchListener {
}
public void initialize(int hour, int minute, boolean is24HourMode) {
- mIs24HourMode = is24HourMode;
+ if (mIs24HourMode != is24HourMode) {
+ mIs24HourMode = is24HourMode;
+ initData();
+ }
setCurrentHourInternal(hour, false, false);
setCurrentMinuteInternal(minute, false);