Chromium Code Reviews| Index: content/public/android/java/src/org/chromium/content/browser/input/MonthPicker.java |
| diff --git a/content/public/android/java/src/org/chromium/content/browser/input/MonthPicker.java b/content/public/android/java/src/org/chromium/content/browser/input/MonthPicker.java |
| index ab1f31e4d9a841427e7dba264e57292671e4aad6..28cd3229276137a50e5f45357ad99d0ee599885e 100644 |
| --- a/content/public/android/java/src/org/chromium/content/browser/input/MonthPicker.java |
| +++ b/content/public/android/java/src/org/chromium/content/browser/input/MonthPicker.java |
| @@ -12,6 +12,7 @@ import java.text.DateFormatSymbols; |
| import java.util.Arrays; |
| import java.util.Calendar; |
| import java.util.Locale; |
| +import java.util.TimeZone; |
| public class MonthPicker extends TwoFieldDatePicker { |
| private static final int MONTHS_NUMBER = 12; |
| @@ -29,7 +30,7 @@ public class MonthPicker extends TwoFieldDatePicker { |
| DateFormatSymbols.getInstance(Locale.getDefault()).getShortMonths(); |
| // initialize to current date |
| - Calendar cal = Calendar.getInstance(); |
| + Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC")); |
| init(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), null); |
| } |
| @@ -37,15 +38,20 @@ public class MonthPicker extends TwoFieldDatePicker { |
| protected Calendar createDateFromValue(long value) { |
| int year = (int) Math.min(value / 12 + 1970, Integer.MAX_VALUE); |
| int month = (int) (value % 12); |
| - Calendar cal = Calendar.getInstance(); |
| + Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC")); |
| cal.clear(); |
| cal.set(year, month, 1); |
| return cal; |
| } |
| @Override |
| + protected long valueFromDate(int year, int month) { |
|
Miguel Garcia
2013/11/26 16:07:08
shouldn't this return a double? That's what you ar
keishi
2013/11/27 06:58:38
Done. Changed to double.
|
| + return (year - 1970) * 12 + month; |
| + } |
| + |
| + @Override |
| protected void setCurrentDate(int year, int month) { |
| - Calendar date = Calendar.getInstance(); |
| + Calendar date = Calendar.getInstance(TimeZone.getTimeZone("UTC")); |
| date.set(year, month, 1); |
| if (date.before(getMinDate())) { |
| setCurrentDate(getMinDate()); |