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

Commit f63757b7 authored by Alan Viverette's avatar Alan Viverette
Browse files

Scale month view for small screens, use verbatim span for AM/PM label 

Also fixes initial day selection in DatePickerDialog.

Bug: 19933912
Bug: 19937345
Change-Id: I88264a192c087361dbf21b055e74e1facf2506bc
parent 79274b30

core/java/android/widget/DayPickerView.java

+3 −1
Original line number Diff line number Diff line
@@ -187,7 +187,6 @@ class DayPickerView extends ViewPager { 
     * @param setSelected whether to set the specified day as selected

     */

    private void setDate(long timeInMillis, boolean animate, boolean setSelected) {

        // Set the selected day

        if (setSelected) {

            mSelectedDay.setTimeInMillis(timeInMillis);

        }
@@ -196,6 +195,9 @@ class DayPickerView extends ViewPager { 
        if (position != getCurrentItem()) {

            setCurrentItem(position, animate);

        }



        mTempCalendar.setTimeInMillis(timeInMillis);

        mAdapter.setSelectedDay(mTempCalendar);

    }



    public long getDate() {

core/java/android/widget/SimpleMonthView.java

+66 −28
Original line number Diff line number Diff line
@@ -80,11 +80,12 @@ class SimpleMonthView extends View { 
    private final SimpleDateFormat mTitleFormatter;

    private final SimpleDateFormat mDayOfWeekFormatter;



    private final int mMonthHeight;

    private final int mDayOfWeekHeight;

    private final int mDayHeight;

    private final int mCellWidth;

    private final int mDaySelectorRadius;

    // Desired dimensions.

    private final int mDesiredMonthHeight;

    private final int mDesiredDayOfWeekHeight;

    private final int mDesiredDayHeight;

    private final int mDesiredCellWidth;

    private final int mDesiredDaySelectorRadius;



    // Next/previous drawables.

    private final Drawable mPrevDrawable;
@@ -99,6 +100,13 @@ class SimpleMonthView extends View { 
    private int mMonth;

    private int mYear;



    // Dimensions as laid out.

    private int mMonthHeight;

    private int mDayOfWeekHeight;

    private int mDayHeight;

    private int mCellWidth;

    private int mDaySelectorRadius;



    private int mPaddedWidth;

    private int mPaddedHeight;
@@ -158,11 +166,11 @@ class SimpleMonthView extends View { 
        super(context, attrs, defStyleAttr, defStyleRes);



        final Resources res = context.getResources();

        mMonthHeight = res.getDimensionPixelSize(R.dimen.date_picker_month_height);

        mDayOfWeekHeight = res.getDimensionPixelSize(R.dimen.date_picker_day_of_week_height);

        mDayHeight = res.getDimensionPixelSize(R.dimen.date_picker_day_height);

        mCellWidth = res.getDimensionPixelSize(R.dimen.date_picker_day_width);

        mDaySelectorRadius = res.getDimensionPixelSize(R.dimen.date_picker_day_selector_radius);

        mDesiredMonthHeight = res.getDimensionPixelSize(R.dimen.date_picker_month_height);

        mDesiredDayOfWeekHeight = res.getDimensionPixelSize(R.dimen.date_picker_day_of_week_height);

        mDesiredDayHeight = res.getDimensionPixelSize(R.dimen.date_picker_day_height);

        mDesiredCellWidth = res.getDimensionPixelSize(R.dimen.date_picker_day_width);

        mDesiredDaySelectorRadius = res.getDimensionPixelSize(R.dimen.date_picker_day_selector_radius);



        mPrevDrawable = context.getDrawable(R.drawable.ic_chevron_left);

        mNextDrawable = context.getDrawable(R.drawable.ic_chevron_right);
@@ -400,7 +408,7 @@ class SimpleMonthView extends View { 
        final TextPaint p = mDayOfWeekPaint;

        final int headerHeight = mMonthHeight;

        final int rowHeight = mDayOfWeekHeight;

        final int colWidth = mPaddedWidth / DAYS_IN_WEEK;

        final int colWidth = mCellWidth;



        // Text is vertically centered within the day of week height.

        final float halfLineHeight = (p.ascent() + p.descent()) / 2f;
@@ -426,7 +434,7 @@ class SimpleMonthView extends View { 
        final TextPaint p = mDayPaint;

        final int headerHeight = mMonthHeight + mDayOfWeekHeight;

        final int rowHeight = mDayHeight;

        final int colWidth = mPaddedWidth / DAYS_IN_WEEK;

        final int colWidth = mCellWidth;



        // Text is vertically centered within the row height.

        final float halfLineHeight = (p.ascent() + p.descent()) / 2f;
@@ -627,9 +635,9 @@ class SimpleMonthView extends View { 


    @Override

    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {

        final int preferredHeight = mDayHeight * mNumWeeks + mDayOfWeekHeight + mMonthHeight

                + getPaddingTop() + getPaddingBottom();

        final int preferredWidth = mCellWidth * DAYS_IN_WEEK

        final int preferredHeight = mDesiredDayHeight * mNumWeeks + mDesiredDayOfWeekHeight

                + mDesiredMonthHeight + getPaddingTop() + getPaddingBottom();

        final int preferredWidth = mDesiredCellWidth * DAYS_IN_WEEK

                + getPaddingStart() + getPaddingEnd();

        final int resolvedWidth = resolveSize(preferredWidth, widthMeasureSpec);

        final int resolvedHeight = resolveSize(preferredHeight, heightMeasureSpec);
@@ -637,16 +645,46 @@ class SimpleMonthView extends View { 
    }



    @Override

    protected void onSizeChanged(int w, int h, int oldw, int oldh) {

        final int paddedLeft = getPaddingLeft();

        final int paddedTop = getPaddingTop();

        final int paddedRight = w - getPaddingRight();

        final int paddedBottom = h - getPaddingBottom();

        mPaddedWidth = paddedRight - paddedLeft;

        mPaddedHeight = paddedBottom - paddedTop;



        final int monthHeight = mMonthHeight;

    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {

        if (!changed) {

            return;

        }



        // Let's initialize a completely reasonable number of variables.

        final int w = right - left;

        final int h = bottom - top;

        final int paddingLeft = getPaddingLeft();

        final int paddingTop = getPaddingTop();

        final int paddingRight = getPaddingRight();

        final int paddingBottom = getPaddingBottom();

        final int paddedRight = w - paddingRight;

        final int paddedBottom = h - paddingBottom;

        final int paddedWidth = paddedRight - paddingLeft;

        final int paddedHeight = paddedBottom - paddingTop;

        if (paddedWidth == mPaddedWidth || paddedHeight == mPaddedHeight) {

            return;

        }



        mPaddedWidth = paddedWidth;

        mPaddedHeight = paddedHeight;



        // We may have been laid out smaller than our preferred size. If so,

        // scale all dimensions to fit.

        final int measuredPaddedHeight = getMeasuredHeight() - paddingTop - paddingBottom;

        final float scaleH = paddedHeight / (float) measuredPaddedHeight;

        final int monthHeight = (int) (mDesiredMonthHeight * scaleH);

        final int cellWidth = mPaddedWidth / DAYS_IN_WEEK;

        mMonthHeight = monthHeight;

        mDayOfWeekHeight = (int) (mDesiredDayOfWeekHeight * scaleH);

        mDayHeight = (int) (mDesiredDayHeight * scaleH);

        mCellWidth = cellWidth;



        // Compute the largest day selector radius that's still within the clip

        // bounds and desired selector radius.

        final int maxSelectorWidth = cellWidth / 2 + Math.min(paddingLeft, paddingRight);

        final int maxSelectorHeight = mDayHeight / 2 + paddingBottom;

        mDaySelectorRadius = Math.min(mDesiredDaySelectorRadius,

                Math.min(maxSelectorWidth, maxSelectorHeight));



        // Vertically center the previous/next drawables within the month

        // header, horizontally center within the day cell, then expand the
@@ -660,7 +698,7 @@ class SimpleMonthView extends View { 


            // Button bounds don't include padding, but hit area does.

            prevDrawable.setBounds(iconLeft, iconTop, iconLeft + dW, iconTop + dH);

            mPrevHitArea.set(0, 0, paddedLeft + cellWidth, paddedTop + monthHeight);

            mPrevHitArea.set(0, 0, paddingLeft + cellWidth, paddingTop + monthHeight);

        }



        final Drawable nextDrawable = mNextDrawable;
@@ -668,11 +706,11 @@ class SimpleMonthView extends View { 
            final int dW = nextDrawable.getIntrinsicWidth();

            final int dH = nextDrawable.getIntrinsicHeight();

            final int iconTop = (monthHeight - dH) / 2;

            final int iconRight = mPaddedWidth - (cellWidth - dW) / 2;

            final int iconRight = paddedWidth - (cellWidth - dW) / 2;



            // Button bounds don't include padding, but hit area does.

            nextDrawable.setBounds(iconRight - dW, iconTop, iconRight, iconTop + dH);

            mNextHitArea.set(paddedRight - cellWidth, 0, w, paddedTop + monthHeight);

            mNextHitArea.set(paddedRight - cellWidth, 0, w, paddingTop + monthHeight);

        }



        // Invalidate cached accessibility information.
@@ -753,7 +791,7 @@ class SimpleMonthView extends View { 


        // Compute left edge.

        final int col = index % DAYS_IN_WEEK;

        final int colWidth = mPaddedWidth / DAYS_IN_WEEK;

        final int colWidth = mCellWidth;

        final int left = getPaddingLeft() + col * colWidth;



        // Compute top edge.

core/java/android/widget/TimePickerClockDelegate.java

+12 −2
Original line number Diff line number Diff line
@@ -25,8 +25,10 @@ import android.content.res.TypedArray; 
import android.graphics.drawable.Drawable;

import android.os.Parcel;

import android.os.Parcelable;

import android.text.SpannableStringBuilder;

import android.text.format.DateFormat;

import android.text.format.DateUtils;

import android.text.style.TtsSpan;

import android.util.AttributeSet;

import android.util.Log;

import android.util.StateSet;
@@ -155,13 +157,16 @@ class TimePickerClockDelegate extends TimePicker.AbstractTimePickerDelegate impl 
        mHourView.setMinWidth(computeStableWidth(mHourView, 24));

        mMinuteView.setMinWidth(computeStableWidth(mMinuteView, 60));



        final SpannableStringBuilder amLabel = new SpannableStringBuilder()

                .append(amPmStrings[0], new TtsSpan.VerbatimBuilder(amPmStrings[0]).build(), 0);



        // Set up AM/PM labels.

        mAmPmLayout = mainView.findViewById(R.id.ampm_layout);

        mAmLabel = (CheckedTextView) mAmPmLayout.findViewById(R.id.am_label);

        mAmLabel.setText(amPmStrings[0]);

        mAmLabel.setText(obtainVerbatim(amPmStrings[0]));

        mAmLabel.setOnClickListener(mClickListener);

        mPmLabel = (CheckedTextView) mAmPmLayout.findViewById(R.id.pm_label);

        mPmLabel.setText(amPmStrings[1]);

        mPmLabel.setText(obtainVerbatim(amPmStrings[1]));

        mPmLabel.setOnClickListener(mClickListener);



        // For the sake of backwards compatibility, attempt to extract the text
@@ -220,6 +225,11 @@ class TimePickerClockDelegate extends TimePicker.AbstractTimePickerDelegate impl 
        initialize(currentHour, currentMinute, false /* 12h */, HOUR_INDEX);

    }



    private static final CharSequence obtainVerbatim(String text) {

        return new SpannableStringBuilder().append(text,

                new TtsSpan.VerbatimBuilder(text).build(), 0);

    }



    /**

     * The legacy text color might have been poorly defined. Ensures that it

     * has an appropriate activated state, using the selected state if one