Chromium Code Reviews| 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 b8924f4e420d36ce0acd68a5c606a1de4e665eb7..ddc5b0628c69318fe6e9dd9952a0b902c46e4238 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 |
| @@ -9,6 +9,7 @@ import android.content.Context; |
| import org.chromium.content.R; |
| import java.util.Calendar; |
| +import java.util.TimeZone; |
| // This class is heavily based on android.widget.DatePicker. |
| public class WeekPicker extends TwoFieldDatePicker { |
| @@ -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) { |
|
Miguel Garcia
2013/11/26 16:07:08
another double vs long here
keishi
2013/11/27 06:58:38
Done.
|
| + return createDateFromWeek(year, week).getTimeInMillis(); |
| + } |
| + |
| public static int getISOWeekYearForDate(Calendar date) { |
| int year = date.get(Calendar.YEAR); |
| int month = date.get(Calendar.MONTH); |