| 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 c6dfd616c388138575db5a16a207d8b5a69c79ef..c84ac38352f572e7b3accdcb179ff8a652886181 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
|
| @@ -14,6 +14,7 @@ import android.widget.FrameLayout;
|
| import android.widget.NumberPicker;
|
|
|
| import java.util.Calendar;
|
| +import java.util.TimeZone;
|
|
|
| import org.chromium.content.R;
|
|
|
| @@ -85,11 +86,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);
|
| @@ -134,6 +135,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.
|
| @@ -182,6 +188,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();
|
|
|