Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b3f85f8 authored by Alan Viverette's avatar Alan Viverette
Browse files

Use Holo date/time picker layouts on very small screens 

If the screen is smaller than "small" then use the Holo picker layouts.
Unifies the SavedState between delegates so that we can seamlessly
transition between them during configuration changes. Pushes the
DatePickerSpinnerDelegate up to the same level as the calendar delegate.

Bug: 27239893
Change-Id: Ida4dc2748d38bd766ae93d12aef15e963921939c
parent 8fc5462e

core/java/android/widget/DatePicker.java

+85 −651

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/widget/DatePickerCalendarDelegate.java

+23 −126
Original line number Diff line number Diff line
@@ -16,13 +16,14 @@ 


package android.widget;



import com.android.internal.R;



import android.annotation.Nullable;

import android.content.Context;

import android.content.res.ColorStateList;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.content.res.TypedArray;

import android.os.Parcel;

import android.os.Parcelable;

import android.text.format.DateFormat;

import android.text.format.DateUtils;
@@ -37,8 +38,6 @@ import android.view.accessibility.AccessibilityEvent; 
import android.widget.DayPickerView.OnDaySelectedListener;

import android.widget.YearPickerView.OnYearSelectedListener;



import com.android.internal.R;



import java.text.SimpleDateFormat;

import java.util.Calendar;

import java.util.Locale;
@@ -550,6 +549,7 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate { 


    @Override

    public void onRestoreInstanceState(Parcelable state) {

        if (state instanceof SavedState) {

            final SavedState ss = (SavedState) state;



            // TODO: Move instance state into DayPickerView, YearPickerView.
@@ -572,6 +572,7 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate { 
                }

            }

        }

    }



    @Override

    public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
@@ -613,108 +614,4 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate { 
    private void tryVibrate() {

        mDelegator.performHapticFeedback(HapticFeedbackConstants.CALENDAR_DATE);

    }



    /**

     * Class for managing state storing/restoring.

     */

    private static class SavedState extends View.BaseSavedState {

        private final int mSelectedYear;

        private final int mSelectedMonth;

        private final int mSelectedDay;

        private final long mMinDate;

        private final long mMaxDate;

        private final int mCurrentView;

        private final int mListPosition;

        private final int mListPositionOffset;



        /**

         * Constructor called from {@link DatePicker#onSaveInstanceState()}

         */

        private SavedState(Parcelable superState, int year, int month, int day,

                long minDate, long maxDate, int currentView, int listPosition,

                int listPositionOffset) {

            super(superState);

            mSelectedYear = year;

            mSelectedMonth = month;

            mSelectedDay = day;

            mMinDate = minDate;

            mMaxDate = maxDate;

            mCurrentView = currentView;

            mListPosition = listPosition;

            mListPositionOffset = listPositionOffset;

        }



        /**

         * Constructor called from {@link #CREATOR}

         */

        private SavedState(Parcel in) {

            super(in);

            mSelectedYear = in.readInt();

            mSelectedMonth = in.readInt();

            mSelectedDay = in.readInt();

            mMinDate = in.readLong();

            mMaxDate = in.readLong();

            mCurrentView = in.readInt();

            mListPosition = in.readInt();

            mListPositionOffset = in.readInt();

        }



        @Override

        public void writeToParcel(Parcel dest, int flags) {

            super.writeToParcel(dest, flags);

            dest.writeInt(mSelectedYear);

            dest.writeInt(mSelectedMonth);

            dest.writeInt(mSelectedDay);

            dest.writeLong(mMinDate);

            dest.writeLong(mMaxDate);

            dest.writeInt(mCurrentView);

            dest.writeInt(mListPosition);

            dest.writeInt(mListPositionOffset);

        }



        public int getSelectedDay() {

            return mSelectedDay;

        }



        public int getSelectedMonth() {

            return mSelectedMonth;

        }



        public int getSelectedYear() {

            return mSelectedYear;

        }



        public long getMinDate() {

            return mMinDate;

        }



        public long getMaxDate() {

            return mMaxDate;

        }



        public int getCurrentView() {

            return mCurrentView;

        }



        public int getListPosition() {

            return mListPosition;

        }



        public int getListPositionOffset() {

            return mListPositionOffset;

        }



        @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];

            }

        };

    }

}

core/java/android/widget/DatePickerSpinnerDelegate.java

0 → 100644
+652 −0

File added.

Preview size limit exceeded, changes collapsed.

core/java/android/widget/TimePicker.java

+67 −0
Original line number Diff line number Diff line
@@ -22,8 +22,11 @@ import android.annotation.Widget; 
import android.content.Context;

import android.content.res.Configuration;

import android.content.res.TypedArray;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.Parcelable.Creator;

import android.util.AttributeSet;

import android.view.View;

import android.view.accessibility.AccessibilityEvent;

import com.android.internal.R;
@@ -301,5 +304,69 @@ public class TimePicker extends FrameLayout { 
            mContext = context;

            mLocale = context.getResources().getConfiguration().locale;

        }



        protected static class SavedState extends View.BaseSavedState {

            private final int mHour;

            private final int mMinute;

            private final boolean mIs24HourMode;

            private final int mCurrentItemShowing;



            public SavedState(Parcelable superState, int hour, int minute, boolean is24HourMode) {

                this(superState, hour, minute, is24HourMode, 0);

            }



            public SavedState(Parcelable superState, int hour, int minute, boolean is24HourMode,

                    int currentItemShowing) {

                super(superState);

                mHour = hour;

                mMinute = minute;

                mIs24HourMode = is24HourMode;

                mCurrentItemShowing = currentItemShowing;

            }



            private SavedState(Parcel in) {

                super(in);

                mHour = in.readInt();

                mMinute = in.readInt();

                mIs24HourMode = (in.readInt() == 1);

                mCurrentItemShowing = in.readInt();

            }



            public int getHour() {

                return mHour;

            }



            public int getMinute() {

                return mMinute;

            }



            public boolean is24HourMode() {

                return mIs24HourMode;

            }



            public int getCurrentItemShowing() {

                return mCurrentItemShowing;

            }



            @Override

            public void writeToParcel(Parcel dest, int flags) {

                super.writeToParcel(dest, flags);

                dest.writeInt(mHour);

                dest.writeInt(mMinute);

                dest.writeInt(mIs24HourMode ? 1 : 0);

                dest.writeInt(mCurrentItemShowing);

            }



            @SuppressWarnings({"unused", "hiding"})

            public static final Creator<SavedState> CREATOR = new Creator<SavedState>() {

                public SavedState createFromParcel(Parcel in) {

                    return new SavedState(in);

                }



                public SavedState[] newArray(int size) {

                    return new SavedState[size];

                }

            };

        }

    }

}

core/java/android/widget/TimePickerClockDelegate.java

+5 −69
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.content.Context; 
import android.content.res.ColorStateList;

import android.content.res.Resources;

import android.content.res.TypedArray;

import android.os.Parcel;

import android.os.Parcelable;

import android.text.SpannableStringBuilder;

import android.text.format.DateFormat;
@@ -45,7 +44,6 @@ import com.android.internal.widget.NumericTextView; 
import com.android.internal.widget.NumericTextView.OnValueChangedListener;



import java.util.Calendar;

import java.util.Locale;



/**

 * A delegate implementing the radial clock-based TimePicker.
@@ -501,10 +499,12 @@ class TimePickerClockDelegate extends TimePicker.AbstractTimePickerDelegate impl 


    @Override

    public void onRestoreInstanceState(Parcelable state) {

        if (state instanceof SavedState) {

            final SavedState ss = (SavedState) state;

            initialize(ss.getHour(), ss.getMinute(), ss.is24HourMode(), ss.getCurrentItemShowing());

            mRadialTimePickerView.invalidate();

        }

    }



    @Override

    public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
@@ -544,70 +544,6 @@ class TimePickerClockDelegate extends TimePicker.AbstractTimePickerDelegate impl 
        }

    }



    /**

     * Used to save / restore state of time picker

     */

    private static class SavedState extends View.BaseSavedState {



        private final int mHour;

        private final int mMinute;

        private final boolean mIs24HourMode;

        private final int mCurrentItemShowing;



        private SavedState(Parcelable superState, int hour, int minute, boolean is24HourMode,

                int currentItemShowing) {

            super(superState);

            mHour = hour;

            mMinute = minute;

            mIs24HourMode = is24HourMode;

            mCurrentItemShowing = currentItemShowing;

        }



        private SavedState(Parcel in) {

            super(in);

            mHour = in.readInt();

            mMinute = in.readInt();

            mIs24HourMode = (in.readInt() == 1);

            mCurrentItemShowing = in.readInt();

        }



        public int getHour() {

            return mHour;

        }



        public int getMinute() {

            return mMinute;

        }



        public boolean is24HourMode() {

            return mIs24HourMode;

        }



        public int getCurrentItemShowing() {

            return mCurrentItemShowing;

        }



        @Override

        public void writeToParcel(Parcel dest, int flags) {

            super.writeToParcel(dest, flags);

            dest.writeInt(mHour);

            dest.writeInt(mMinute);

            dest.writeInt(mIs24HourMode ? 1 : 0);

            dest.writeInt(mCurrentItemShowing);

        }



        @SuppressWarnings({"unused", "hiding"})

        public static final Creator<SavedState> CREATOR = new Creator<SavedState>() {

            public SavedState createFromParcel(Parcel in) {

                return new SavedState(in);

            }



            public SavedState[] newArray(int size) {

                return new SavedState[size];

            }

        };

    }



    private void tryVibrate() {

        mDelegator.performHapticFeedback(HapticFeedbackConstants.CLOCK_TICK);

    }