Index: content/public/android/java/src/org/chromium/content/browser/input/WeekPicker.java |
diff --git a/content/public/android/java/src/org/chromium/content/browser/input/WeekPicker.java b/content/public/android/java/src/org/chromium/content/browser/input/WeekPicker.java |
index efca4763a2935d43d68b6ba201421448e54123d6..e98446aba8895ce6961949009904721d742f4179 100644 |
--- a/content/public/android/java/src/org/chromium/content/browser/input/WeekPicker.java |
+++ b/content/public/android/java/src/org/chromium/content/browser/input/WeekPicker.java |
@@ -7,6 +7,7 @@ package org.chromium.content.browser.input; |
import android.content.Context; |
import java.util.Calendar; |
+import java.util.TimeZone; |
import org.chromium.content.R; |
@@ -20,7 +21,7 @@ public class WeekPicker extends TwoFieldDatePicker { |
getResources().getString(R.string.accessibility_date_picker_week)); |
// initialize to current date |
- Calendar cal = Calendar.getInstance(); |
+ Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC")); |
cal.setFirstDayOfWeek(Calendar.MONDAY); |
cal.setMinimalDaysInFirstWeek(4); |
cal.setTimeInMillis(System.currentTimeMillis()); |
@@ -28,7 +29,7 @@ public class WeekPicker extends TwoFieldDatePicker { |
} |
private Calendar createDateFromWeek(int year, int week) { |
- Calendar date = Calendar.getInstance(); |
+ Calendar date = Calendar.getInstance(TimeZone.getTimeZone("UTC")); |
date.clear(); |
date.setFirstDayOfWeek(Calendar.MONDAY); |
date.setMinimalDaysInFirstWeek(4); |
@@ -40,7 +41,7 @@ public class WeekPicker extends TwoFieldDatePicker { |
@Override |
protected Calendar createDateFromValue(long value) { |
- Calendar date = Calendar.getInstance(); |
+ Calendar date = Calendar.getInstance(TimeZone.getTimeZone("UTC")); |
date.clear(); |
date.setFirstDayOfWeek(Calendar.MONDAY); |
date.setMinimalDaysInFirstWeek(4); |
@@ -48,6 +49,11 @@ public class WeekPicker extends TwoFieldDatePicker { |
return date; |
} |
+ @Override |
+ protected long valueFromDate(int year, int week) { |
+ return createDateFromWeek(year, week).getTimeInMillis(); |
+ } |
+ |
public static int getISOWeekYearForDate(Calendar date) { |
int year = date.get(Calendar.YEAR); |
int month = date.get(Calendar.MONTH); |