[Android] Implement min/max on all supported date types

content/public/android/java/src/org/chromium/content/browser/input/MonthPicker.java

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 01e636eb10168ed3e9ff3e584d8edb3d94623eb0..80454f9e9dbe23fbee415dfe85f3f55c7787dba2 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
@@ -13,7 +13,6 @@ import android.util.AttributeSet;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.accessibility.AccessibilityEvent;
-import android.widget.DatePicker;
 import android.widget.FrameLayout;
 import android.widget.NumberPicker;
 import android.widget.NumberPicker.OnValueChangeListener;
@@ -26,35 +25,26 @@ import java.util.TimeZone;
 
 import org.chromium.content.R;
 
-// This class is heavily based on android.widget.DatePicker.
 public class MonthPicker extends FrameLayout {
-
-    private static final int DEFAULT_START_YEAR = 1900;
-
-    private static final int DEFAULT_END_YEAR = 2100;
-
-    private static final boolean DEFAULT_ENABLED_STATE = true;
+    private static final int MONTHS_NUMBER = 12;

[bulach, 2013/05/21 17:26:35]

is it true for all calendars? I thought the idea here is that the number of
months would be locale dependent... which also brings the question, is the param
coming from blink guaranteed to be in a 12-months calendar?

[Miguel Garcia, 2013/05/23 12:16:48]

I think what is locale dependendent is only the short name of the months. The
spec does not support  chinese calendars and or other variations.


From http://www.w3.org/TR/html-markup/input.month.html

value = month
A string representing a month.
The following parts, in exactly the following order:
Four or more digits representing a number greater than 0.
The literal string "-".
Two digits, representing the month month, in the range 1 ≤ month, ≤ 12.


On 2013/05/21 17:26:35, bulach wrote:

 
     private final NumberPicker mMonthSpinner;
 
     private final NumberPicker mYearSpinner;
 
-    private Locale mCurrentLocale;
-
     private OnMonthChangedListener mMonthChangedListener;
 
     private String[] mShortMonths;
 
-    private int mNumberOfMonths;
-
+    // It'd be nice to use android.text.Time like in other Dialogs but
+    // it suffers from the 2038 effect so it would prevent us from
+    // having dates over 2038.
     private Calendar mMinDate;
 
     private Calendar mMaxDate;
 
     private Calendar mCurrentDate;
 
-    private boolean mIsEnabled = DEFAULT_ENABLED_STATE;
-
     /**
      * The callback used to indicate the user changes\d the date.
      */
@@ -71,22 +61,12 @@ public class MonthPicker extends FrameLayout {
         void onMonthChanged(MonthPicker view, int year, int monthOfYear);
     }
 
-    public MonthPicker(Context context) {
-        this(context, null);
-    }
-
-    public MonthPicker(Context context, AttributeSet attrs) {
-        this(context, attrs, android.R.attr.datePickerStyle);
-    }
-
-    public MonthPicker(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
+    public MonthPicker(Context context, long minMonth, long maxMonth) {
+        super(context, null, android.R.attr.datePickerStyle);
 
         // initialization based on locale
-        setCurrentLocale(Locale.getDefault());
-
-        int startYear = DEFAULT_START_YEAR;
-        int endYear = DEFAULT_END_YEAR;
+        mShortMonths =
+                DateFormatSymbols.getInstance(Locale.getDefault()).getShortMonths();
 
         LayoutInflater inflater = (LayoutInflater) context
                 .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
@@ -95,26 +75,25 @@ public class MonthPicker extends FrameLayout {
         OnValueChangeListener onChangeListener = new OnValueChangeListener() {
             @Override
             public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
-                Calendar tempDate = getCalendarForLocale(null, mCurrentLocale);
-                tempDate.setTimeInMillis(mCurrentDate.getTimeInMillis());
+                int month = mCurrentDate.get(Calendar.MONTH);
+                int year = mCurrentDate.get(Calendar.YEAR);
 
-                // take care of wrapping of days and months to update greater fields
+                // take care of wrapping months to update greater fields
                 if (picker == mMonthSpinner) {
+                    month = newVal;
                     if (oldVal == 11 && newVal == 0) {
-                        tempDate.add(Calendar.MONTH, 1);
+                        year += 1;
                     } else if (oldVal == 0 && newVal == 11) {

[bulach, 2013/05/21 17:26:35]

I don't fully appreciate the logic here, but it seems this is also broken for
different calendars..

[Miguel Garcia, 2013/05/23 12:16:48]

I think this had in mind a much more complex spec than what is really accepted,
see above.

On 2013/05/21 17:26:35, bulach wrote:

-                        tempDate.add(Calendar.MONTH, -1);
-                    } else {
-                        tempDate.add(Calendar.MONTH, newVal - oldVal);
+                        year -=1;
                     }
                 } else if (picker == mYearSpinner) {
-                    tempDate.set(Calendar.YEAR, newVal);
-                } else {
+                    year = newVal;
+                 } else {
                     throw new IllegalArgumentException();
                 }
 
                 // now set the date to the adjusted one
-                setDate(tempDate.get(Calendar.YEAR), tempDate.get(Calendar.MONTH));
+                setCurrentDate(month, year);
                 updateSpinners();
                 notifyDateChanged();
             }
@@ -123,7 +102,7 @@ public class MonthPicker extends FrameLayout {
         // month
         mMonthSpinner = (NumberPicker) findViewById(R.id.month);
         mMonthSpinner.setMinValue(0);
-        mMonthSpinner.setMaxValue(mNumberOfMonths - 1);
+        mMonthSpinner.setMaxValue(MONTHS_NUMBER - 1);
         mMonthSpinner.setDisplayedValues(mShortMonths);

[bulach, 2013/05/21 17:26:35]

so here, mShortMonths could potentially be different from MONTHS_NUMBER..

[Miguel Garcia, 2013/05/23 12:16:48]

Done.

         mMonthSpinner.setOnLongPressUpdateInterval(200);
         mMonthSpinner.setOnValueChangedListener(onChangeListener);
@@ -133,102 +112,43 @@ public class MonthPicker extends FrameLayout {
         mYearSpinner.setOnLongPressUpdateInterval(100);
         mYearSpinner.setOnValueChangedListener(onChangeListener);
 
-        Calendar tempDate = getCalendarForLocale(null, mCurrentLocale);
-        tempDate.set(startYear, 0, 1);
-
-        setMinDate(tempDate.getTimeInMillis());
-        tempDate.set(endYear, 11, 31);
-        setMaxDate(tempDate.getTimeInMillis());
+        mMinDate = monthsToCalendar(minMonth);
+        mMaxDate = monthsToCalendar(maxMonth);
 
         // initialize to current date
-        mCurrentDate.setTimeInMillis(System.currentTimeMillis());
-        init(mCurrentDate.get(Calendar.YEAR), mCurrentDate.get(Calendar.MONTH), null);
+        Calendar cal = Calendar.getInstance();
+        init(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), null);
     }
 
-    /**
-     * Gets the minimal date supported by this {@link DatePicker} in
-     * milliseconds since January 1, 1970 00:00:00 in
-     * {@link TimeZone#getDefault()} time zone.
-     * <p>
-     * Note: The default minimal date is 01/01/1900.
-     * <p>
-     *
-     * @return The minimal supported date.
-     */
-    public long getMinDate() {
-        return mMinDate.getTimeInMillis();
-    }
-
-    /**
-     * Sets the minimal date supported by this {@link NumberPicker} in
-     * milliseconds since January 1, 1970 00:00:00 in
-     * {@link TimeZone#getDefault()} time zone.
-     *
-     * @param minDate The minimal supported date.
-     */
-    public void setMinDate(long minDate) {
-        Calendar tempDate = getCalendarForLocale(null, mCurrentLocale);
-        tempDate.setTimeInMillis(minDate);
-        if (tempDate.get(Calendar.YEAR) == mMinDate.get(Calendar.YEAR)
-                && tempDate.get(Calendar.DAY_OF_YEAR) != mMinDate.get(Calendar.DAY_OF_YEAR)) {
-            return;
-        }
-        mMinDate.setTimeInMillis(minDate);
-        if (mCurrentDate.before(mMinDate)) {
-            mCurrentDate.setTimeInMillis(mMinDate.getTimeInMillis());
+    private void setCurrentDate(int month, int year) {
+        if (mCurrentDate == null) {
+            mCurrentDate = Calendar.getInstance();
         }
-        updateSpinners();
-    }
-
-    /**
-     * Gets the maximal date supported by this {@link DatePicker} in
-     * milliseconds since January 1, 1970 00:00:00 in
-     * {@link TimeZone#getDefault()} time zone.
-     * <p>
-     * Note: The default maximal date is 12/31/2100.
-     * <p>
-     *
-     * @return The maximal supported date.
-     */
-    public long getMaxDate() {
-        return mMaxDate.getTimeInMillis();
-    }
-
-    /**
-     * Sets the maximal date supported by this {@link DatePicker} in
-     * milliseconds since January 1, 1970 00:00:00 in
-     * {@link TimeZone#getDefault()} time zone.
-     *
-     * @param maxDate The maximal supported date.
-     */
-    public void setMaxDate(long maxDate) {
-        Calendar tempDate = getCalendarForLocale(null, mCurrentLocale);
-        tempDate.setTimeInMillis(maxDate);
-        if (tempDate.get(Calendar.YEAR) == mMaxDate.get(Calendar.YEAR)
-                && tempDate.get(Calendar.DAY_OF_YEAR) != mMaxDate.get(Calendar.DAY_OF_YEAR)) {
-            return;
-        }
-        mMaxDate.setTimeInMillis(maxDate);
-        if (mCurrentDate.after(mMaxDate)) {
-            mCurrentDate.setTimeInMillis(mMaxDate.getTimeInMillis());
+        mCurrentDate.clear();
+        mCurrentDate.set(year, month, 1);
+        if (mCurrentDate.getTimeInMillis() < mMinDate.getTimeInMillis()) {
+            mCurrentDate.clear();
+            mCurrentDate.set(mMinDate.get(Calendar.YEAR), mMinDate.get(Calendar.MONTH),
+                    mMinDate.get(Calendar.DAY_OF_MONTH));
+        } else if (mCurrentDate.getTimeInMillis() > mMaxDate.getTimeInMillis()) {
+            mCurrentDate.clear();
+            mCurrentDate.set(mMaxDate.get(Calendar.YEAR), mMaxDate.get(Calendar.MONTH),
+                    mMaxDate.get(Calendar.DAY_OF_MONTH));
         }
-        updateSpinners();
     }
 
-    @Override
-    public void setEnabled(boolean enabled) {
-        if (mIsEnabled == enabled) {
-            return;
+    private static Calendar monthsToCalendar(long months) {
+        int maxYear = Integer.MAX_VALUE;
+        long years = (months / 12) + 1970;
+        int year = maxYear;
+        if (years < maxYear) {
+            year = (int) years;
         }

[bulach, 2013/05/21 17:26:35]

nit: perhaps
int year = (int)Math.min(months / 12 + 1970, Integer.MAX_VALUE);

but as above, need to double check the months we received is not localized..
perhaps worth adding a comment.

[Miguel Garcia, 2013/05/23 12:16:48]

Great simplification, thanks!
See above about the different calendars and localization

-        super.setEnabled(enabled);
-        mMonthSpinner.setEnabled(enabled);
-        mYearSpinner.setEnabled(enabled);
-        mIsEnabled = enabled;
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return mIsEnabled;
+        int month = (int) (months % 12);
+        Calendar cal = Calendar.getInstance();
+        cal.clear();
+        cal.set(year, month, 1);
+        return cal;
     }
 
     @Override
@@ -250,59 +170,6 @@ public class MonthPicker extends FrameLayout {
     @Override
     protected void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
-        setCurrentLocale(newConfig.locale);
-    }
-
-    /**
-     * Sets the current locale.
-     *
-     * @param locale The current locale.
-     */
-    private void setCurrentLocale(Locale locale) {
-        if (locale.equals(mCurrentLocale)) {
-            return;
-        }
-
-        mCurrentLocale = locale;
-        mMinDate = getCalendarForLocale(mMinDate, locale);
-        mMaxDate = getCalendarForLocale(mMaxDate, locale);
-        mCurrentDate = getCalendarForLocale(mCurrentDate, locale);
-
-        mShortMonths =
-                DateFormatSymbols.getInstance(mCurrentLocale).getShortMonths();
-        mNumberOfMonths = mShortMonths.length;
-    }
-
-    /**
-     * Gets a calendar for locale bootstrapped with the value of a given calendar.
-     *
-     * @param oldCalendar The old calendar.
-     * @param locale The locale.
-     */
-    private Calendar getCalendarForLocale(Calendar oldCalendar, Locale locale) {
-        if (oldCalendar == null) {
-            return Calendar.getInstance(locale);
-        } else {
-            final long currentTimeMillis = oldCalendar.getTimeInMillis();
-            Calendar newCalendar = Calendar.getInstance(locale);
-            newCalendar.setTimeInMillis(currentTimeMillis);
-            return newCalendar;
-        }
-    }
-
-    /**
-     * Updates the current date.
-     *
-     * @param year The year.
-     * @param month The month which is <strong>starting from zero</strong>.
-     */
-    public void updateMonth(int year, int month) {
-        if (!isNewDate(year, month)) {
-            return;
-        }
-        setDate(year, month);
-        updateSpinners();
-        notifyDateChanged();
     }
 
     // Override so we are in complete control of save / restore for this widget.
@@ -311,20 +178,6 @@ public class MonthPicker extends FrameLayout {
         dispatchThawSelfOnly(container);
     }
 
-    @Override
-    protected Parcelable onSaveInstanceState() {
-        Parcelable superState = super.onSaveInstanceState();
-        return new SavedState(superState, getYear(), getMonth());
-    }
-
-    @Override
-    protected void onRestoreInstanceState(Parcelable state) {
-        SavedState ss = (SavedState) state;
-        super.onRestoreInstanceState(ss.getSuperState());
-        setDate(ss.mYear, ss.mMonth);
-        updateSpinners();
-    }
-
     /**
      * Initialize the state. If the provided values designate an inconsistent
      * date the values are normalized before updating the spinners.
@@ -335,41 +188,28 @@ public class MonthPicker extends FrameLayout {
      *            user, can be null.
      */
     public void init(int year, int monthOfYear, OnMonthChangedListener onMonthChangedListener) {
-        setDate(year, monthOfYear);
+        setCurrentDate(monthOfYear, year);
         updateSpinners();
         mMonthChangedListener = onMonthChangedListener;
     }
 
     private boolean isNewDate(int year, int month) {
-        return (mCurrentDate.get(Calendar.YEAR) != year
-                || mCurrentDate.get(Calendar.MONTH) != month);
-    }
-
-    private void setDate(int year, int month) {
-        mCurrentDate.set(year, month, 1);
-        if (mCurrentDate.before(mMinDate)) {
-            mCurrentDate.setTimeInMillis(mMinDate.getTimeInMillis());
-        } else if (mCurrentDate.after(mMaxDate)) {
-            mCurrentDate.setTimeInMillis(mMaxDate.getTimeInMillis());
-        }
+        return (mCurrentDate.get(Calendar.YEAR) != year ||
+                mCurrentDate.get(Calendar.MONTH) != month);
     }
 
     private void updateSpinners() {
         // set the spinner ranges respecting the min and max dates
-        if (mCurrentDate.equals(mMinDate)) {
-            mMonthSpinner.setDisplayedValues(null);
-            mMonthSpinner.setMinValue(mCurrentDate.get(Calendar.MONTH));
-            mMonthSpinner.setMaxValue(mCurrentDate.getActualMaximum(Calendar.MONTH));
+        mMonthSpinner.setDisplayedValues(null);
+        mMonthSpinner.setMinValue(0);
+        mMonthSpinner.setMaxValue(11);
+        if (mCurrentDate.get(Calendar.YEAR) == mMinDate.get(Calendar.YEAR)) {
+            mMonthSpinner.setMinValue(mMinDate.get(Calendar.MONTH));
             mMonthSpinner.setWrapSelectorWheel(false);
-        } else if (mCurrentDate.equals(mMaxDate)) {
-            mMonthSpinner.setDisplayedValues(null);
-            mMonthSpinner.setMinValue(mCurrentDate.getActualMinimum(Calendar.MONTH));
-            mMonthSpinner.setMaxValue(mCurrentDate.get(Calendar.MONTH));
+        } else if (mCurrentDate.get(Calendar.YEAR) == mMaxDate.get(Calendar.YEAR)) {
+            mMonthSpinner.setMaxValue(mMaxDate.get(Calendar.MONTH));
             mMonthSpinner.setWrapSelectorWheel(false);
         } else {
-            mMonthSpinner.setDisplayedValues(null);
-            mMonthSpinner.setMinValue(0);
-            mMonthSpinner.setMaxValue(11);
             mMonthSpinner.setWrapSelectorWheel(true);
         }
 
@@ -404,13 +244,6 @@ public class MonthPicker extends FrameLayout {
     }
 
     /**
-     * @return The selected day of month.
-     */
-    public int getDayOfMonth() {
-        return mCurrentDate.get(Calendar.DAY_OF_MONTH);
-    }
-
-    /**
      * Notifies the listener, if such, for a change in the selected date.
      */
     private void notifyDateChanged() {
@@ -419,52 +252,4 @@ public class MonthPicker extends FrameLayout {
             mMonthChangedListener.onMonthChanged(this, getYear(), getMonth());
         }
     }
-
-    /**
-     * Class for managing state storing/restoring.
-     */
-    private static class SavedState extends BaseSavedState {
-
-        private final int mYear;
-
-        private final int mMonth;
-
-        /**
-         * Constructor called from {@link DatePicker#onSaveInstanceState()}
-         */
-        private SavedState(Parcelable superState, int year, int month) {
-            super(superState);
-            mYear = year;
-            mMonth = month;
-        }
-
-        /**
-         * Constructor called from {@link #CREATOR}
-         */
-        private SavedState(Parcel in) {
-            super(in);
-            mYear = in.readInt();
-            mMonth = in.readInt();
-        }
-
-        @Override
-        public void writeToParcel(Parcel dest, int flags) {
-            super.writeToParcel(dest, flags);
-            dest.writeInt(mYear);
-            dest.writeInt(mMonth);
-        }
-
-        @SuppressWarnings("all")
-        // suppress unused and hiding
-        public static final Parcelable.Creator<SavedState> CREATOR = new Creator<SavedState>() {
-
-            public SavedState createFromParcel(Parcel in) {
-                return new SavedState(in);
-            }
-
-            public SavedState[] newArray(int size) {
-                return new SavedState[size];
-            }
-        };
-    }
 }