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

Commit 68016a66 authored by Alan Viverette's avatar Alan Viverette
Browse files

Set mTempCalendar in TimePickerSpinnerDelegate 

A previous CL removed setLocale(), which had been initializing the temp
calendar. This CL also makes the calendar final, since the locale is only
set once during construction.

Bug: 25776094
Change-Id: If0af34df3120a7c4b1667129a553b9f8b7ec1999
parent 8fbddc93

core/java/android/widget/TimePickerClockDelegate.java

+2 −2
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ class TimePickerClockDelegate extends TimePicker.AbstractTimePickerDelegate impl 
    private final RadialTimePickerView mRadialTimePickerView;

    private final TextView mSeparatorView;



    private final Calendar mTempCalendar;



    private boolean mIsEnabled = true;

    private boolean mAllowAutoAdvance;

    private int mInitialHourOfDay;
@@ -103,8 +105,6 @@ class TimePickerClockDelegate extends TimePicker.AbstractTimePickerDelegate impl 
    private CharSequence mLastAnnouncedText;

    private boolean mLastAnnouncedIsHour;



    private Calendar mTempCalendar;



    public TimePickerClockDelegate(TimePicker delegator, Context context, AttributeSet attrs,

            int defStyleAttr, int defStyleRes) {

        super(delegator, context);

core/java/android/widget/TimePickerSpinnerDelegate.java

+7 −6
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.view.inputmethod.InputMethodManager; 
import com.android.internal.R;



import java.util.Calendar;

import java.util.Locale;



import libcore.icu.LocaleData;
@@ -45,11 +46,6 @@ class TimePickerSpinnerDelegate extends TimePicker.AbstractTimePickerDelegate { 
    private static final boolean DEFAULT_ENABLED_STATE = true;

    private static final int HOURS_IN_HALF_DAY = 12;



    // state

    private boolean mIs24HourView;

    private boolean mIsAm;



    // ui components

    private final NumberPicker mHourSpinner;

    private final NumberPicker mMinuteSpinner;

    private final NumberPicker mAmPmSpinner;
@@ -66,11 +62,15 @@ class TimePickerSpinnerDelegate extends TimePicker.AbstractTimePickerDelegate { 


    private final String[] mAmPmStrings;



    private final Calendar mTempCalendar;



    private boolean mIsEnabled = DEFAULT_ENABLED_STATE;

    private Calendar mTempCalendar;

    private boolean mHourWithTwoDigit;

    private char mHourFormat;



    private boolean mIs24HourView;

    private boolean mIsAm;



    public TimePickerSpinnerDelegate(TimePicker delegator, Context context, AttributeSet attrs,

            int defStyleAttr, int defStyleRes) {

        super(delegator, context);
@@ -202,6 +202,7 @@ class TimePickerSpinnerDelegate extends TimePicker.AbstractTimePickerDelegate { 
        updateAmPmControl();



        // set to current time

        mTempCalendar = Calendar.getInstance(mLocale);

        setHour(mTempCalendar.get(Calendar.HOUR_OF_DAY));

        setMinute(mTempCalendar.get(Calendar.MINUTE));