From f5b02eb7c43a96d3f70a3ecc81738b0dff86df13 Mon Sep 17 00:00:00 2001 From: Deepanshu Gupta Date: Tue, 18 Nov 2014 21:53:47 +0000 Subject: resolved conflicts for a0bc2e7e to lmp-mr1-dev The original change wasn't properly merged into lmp-mr1-dev because of merge conflicts. This change manually resolves the conflicts. The main reason for the conflict was that TimePickerSpinnerDelegate was swapped with TimePickerClockDelegate. This change also fixes the typo in the original change which was fixed in a subsequent change. Original commit: 12b6d29b7b5592dcfb6e6fd6f0c21a40f37d014a fix for typo: cb09bc45c58740af953874f9915306d351fc3d9d Change-Id: I50bf8c2d86318f632465a38adfad16d1382a9319 --- core/java/android/widget/TimePickerClockDelegate.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'core/java/android/widget/TimePickerClockDelegate.java') diff --git a/core/java/android/widget/TimePickerClockDelegate.java b/core/java/android/widget/TimePickerClockDelegate.java index 8d475a7..a0ae8af 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; -- cgit v1.1