Index: content/public/android/java/src/org/chromium/content/browser/input/TwoFieldDatePicker.java |
diff --git a/content/public/android/java/src/org/chromium/content/browser/input/TwoFieldDatePicker.java b/content/public/android/java/src/org/chromium/content/browser/input/TwoFieldDatePicker.java |
index 8b90c9cbb6fade2a2eb8774c322542433c9a73fb..9128a0cf00a5242d843fd8af8f04eec77ef9d406 100644 |
--- a/content/public/android/java/src/org/chromium/content/browser/input/TwoFieldDatePicker.java |
+++ b/content/public/android/java/src/org/chromium/content/browser/input/TwoFieldDatePicker.java |
@@ -15,6 +15,7 @@ import android.widget.NumberPicker.OnValueChangeListener; |
import org.chromium.content.R; |
import java.util.Calendar; |
+import java.util.TimeZone; |
/** |
* This class is heavily based on android.widget.DatePicker. |
@@ -86,11 +87,11 @@ public abstract class TwoFieldDatePicker extends FrameLayout { |
} |
}; |
- mCurrentDate = Calendar.getInstance(); |
+ mCurrentDate = Calendar.getInstance(TimeZone.getTimeZone("UTC")); |
if (minValue >= maxValue) { |
- mMinDate = Calendar.getInstance(); |
+ mMinDate = Calendar.getInstance(TimeZone.getTimeZone("UTC")); |
mMinDate.set(0, 0, 1); |
- mMaxDate = Calendar.getInstance(); |
+ mMaxDate = Calendar.getInstance(TimeZone.getTimeZone("UTC")); |
mMaxDate.set(9999, 0, 1); |
} else { |
mMinDate = createDateFromValue(minValue); |
@@ -135,6 +136,11 @@ public abstract class TwoFieldDatePicker extends FrameLayout { |
protected abstract Calendar createDateFromValue(long value); |
/** |
+ * Converts the date to a number as defined by the HTML spec. |
+ */ |
+ protected abstract long valueFromDate(int year, int positionInYear); |
+ |
+ /** |
* Updates the current date. |
* |
* @param year The year. |
@@ -183,6 +189,13 @@ public abstract class TwoFieldDatePicker extends FrameLayout { |
} |
/** |
+ * @return The selected value. |
+ */ |
+ public long getValue() { |
+ return valueFromDate(getYear(), getPositionInYear()); |
+ } |
+ |
+ /** |
* @return The selected month or week. |
*/ |
public abstract int getPositionInYear(); |