diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-01-05 23:26:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-05 23:26:04 +0000 |
| commit | 4a5baeaec9294dbb43fe3b36a44b3176101756b6 (patch) | |
| tree | 851690f9b3331917dfa16a3eee9ac8f585bf4262 /core/java/android/widget | |
| parent | 298071951210ae23c8023c4dc8f82da5d1760211 (diff) | |
| parent | f5b02eb7c43a96d3f70a3ecc81738b0dff86df13 (diff) | |
| download | frameworks_base-4a5baeaec9294dbb43fe3b36a44b3176101756b6.zip frameworks_base-4a5baeaec9294dbb43fe3b36a44b3176101756b6.tar.gz frameworks_base-4a5baeaec9294dbb43fe3b36a44b3176101756b6.tar.bz2 | |
Merge "resolved conflicts for a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev
Diffstat (limited to 'core/java/android/widget')
| -rw-r--r-- | core/java/android/widget/TimePickerClockDelegate.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/widget/TimePickerClockDelegate.java b/core/java/android/widget/TimePickerClockDelegate.java index b70595a..1534429 100644 --- a/core/java/android/widget/TimePickerClockDelegate.java +++ b/core/java/android/widget/TimePickerClockDelegate.java @@ -63,6 +63,8 @@ class TimePickerClockDelegate extends TimePicker.AbstractTimePickerDelegate impl // Also NOT a real index, just used for keyboard mode. private static final int ENABLE_PICKER_INDEX = 3; + // LayoutLib relies on these constants. Change TimePickerClockDelegate_Delegate if + // modifying these. static final int AM = 0; static final int PM = 1; |