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

Commit f91ebf54 authored by Alan Viverette's avatar Alan Viverette Committed by android-build-merger
Browse files

Merge "Use correct date pattern for displaying year in DatePicker" into oc-mr1-dev am: c668bc0d 

am: 5b847663

Change-Id: I5b1063b5b787f814ef78d55f6f5868dfb21c4f9d
parents c57a9334 5b847663

core/java/android/widget/DatePickerCalendarDelegate.java

+19 −27
Original line number Diff line number Diff line
@@ -22,11 +22,10 @@ import android.content.res.ColorStateList; 
import android.content.res.Configuration;

import android.content.res.Resources;

import android.content.res.TypedArray;

import android.icu.text.DateFormat;

import android.icu.text.DisplayContext;

import android.icu.text.SimpleDateFormat;

import android.icu.util.Calendar;

import android.os.Parcelable;

import android.text.format.DateFormat;

import android.util.AttributeSet;

import android.util.StateSet;

import android.view.HapticFeedbackConstants;
@@ -62,8 +61,8 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate { 
    private static final int[] ATTRS_DISABLED_ALPHA = new int[] {

            com.android.internal.R.attr.disabledAlpha};



    private SimpleDateFormat mYearFormat;

    private SimpleDateFormat mMonthDayFormat;

    private DateFormat mYearFormat;

    private DateFormat mMonthDayFormat;



    // Top-level container.

    private ViewGroup mContainer;
@@ -273,9 +272,7 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate { 
    /**

     * Listener called when the user clicks on a header item.

     */

    private final OnClickListener mOnHeaderClickListener = new OnClickListener() {

        @Override

        public void onClick(View v) {

    private final OnClickListener mOnHeaderClickListener = v -> {

        tryVibrate();



        switch (v.getId()) {
@@ -286,7 +283,6 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate { 
                setCurrentView(VIEW_MONTH_DAY);

                break;

        }

        }

    };



    @Override
@@ -299,10 +295,9 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate { 
        }



        // Update the date formatter.

        final String datePattern = DateFormat.getBestDateTimePattern(locale, "EMMMd");

        mMonthDayFormat = new SimpleDateFormat(datePattern, locale);

        mMonthDayFormat = DateFormat.getInstanceForSkeleton("EMMMd", locale);

        mMonthDayFormat.setContext(DisplayContext.CAPITALIZATION_FOR_STANDALONE);

        mYearFormat = new SimpleDateFormat("y", locale);

        mYearFormat = DateFormat.getInstanceForSkeleton("y", locale);



        // Update the header text.

        onCurrentDateChanged(false);
@@ -344,15 +339,12 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate { 
            case VIEW_YEAR:

                final int year = mCurrentDate.get(Calendar.YEAR);

                mYearPickerView.setYear(year);

                mYearPickerView.post(new Runnable() {

                    @Override

                    public void run() {

                mYearPickerView.post(() -> {

                    mYearPickerView.requestFocus();

                    final View selected = mYearPickerView.getSelectedView();

                    if (selected != null) {

                        selected.requestFocus();

                    }

                    }

                });



                if (mCurrentView != viewIndex) {