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

Commit 80848bc9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "resolve merge conflicts of 6e37f8a0 to master"

parents d9282535 50309b46

api/test-current.txt

+7 −0
Original line number Diff line number Diff line
@@ -5676,6 +5676,7 @@ package android.app { 
  public class TimePickerDialog extends android.app.AlertDialog implements android.content.DialogInterface.OnClickListener android.widget.TimePicker.OnTimeChangedListener {

    ctor public TimePickerDialog(android.content.Context, android.app.TimePickerDialog.OnTimeSetListener, int, int, boolean);

    ctor public TimePickerDialog(android.content.Context, int, android.app.TimePickerDialog.OnTimeSetListener, int, int, boolean);

    method public android.widget.TimePicker getTimePicker();

    method public void onClick(android.content.DialogInterface, int);

    method public void onTimeChanged(android.widget.TimePicker, int, int);

    method public void updateTime(int, int);
@@ -46743,6 +46744,7 @@ package android.widget { 
    method public int getFirstDayOfWeek();

    method public long getMaxDate();

    method public long getMinDate();

    method public int getMode();

    method public int getMonth();

    method public deprecated boolean getSpinnersShown();

    method public int getYear();
@@ -46754,6 +46756,8 @@ package android.widget { 
    method public void setOnDateChangedListener(android.widget.DatePicker.OnDateChangedListener);

    method public deprecated void setSpinnersShown(boolean);

    method public void updateDate(int, int, int);

    field public static final int MODE_CALENDAR = 2; // 0x2

    field public static final int MODE_SPINNER = 1; // 0x1

  }















  public static abstract interface DatePicker.OnDateChangedListener {










@@ -48523,6 +48527,7 @@ package android.widget {













    method public android.view.View getHourView();















    method public int getMinute();















    method public android.view.View getMinuteView();













    method public int getMode();















    method public android.view.View getPmView();















    method public boolean is24HourView();















    method public deprecated void setCurrentHour(java.lang.Integer);









@@ -48531,6 +48536,8 @@ package android.widget {













    method public void setIs24HourView(java.lang.Boolean);















    method public void setMinute(int);















    method public void setOnTimeChangedListener(android.widget.TimePicker.OnTimeChangedListener);













    field public static final int MODE_CLOCK = 2; // 0x2













    field public static final int MODE_SPINNER = 1; // 0x1















  }





























  public static abstract interface TimePicker.OnTimeChangedListener {

























core/java/android/app/TimePickerDialog.java



+16
−5






























Original line number
Diff line number
Diff line








@@ -16,6 +16,7 @@





























package android.app;





























import android.annotation.TestApi;















import android.content.Context;















import android.content.DialogInterface;















import android.content.DialogInterface.OnClickListener;










@@ -91,6 +92,12 @@ public class TimePickerDialog extends AlertDialog implements OnClickListener,





























    /**















     * Creates a new time picker dialog with the specified theme.













     * <p>













     * The theme is overlaid on top of the theme of the parent {@code context}.













     * If {@code themeResId} is 0, the dialog will be inflated using the theme













     * specified by the













     * {@link android.R.attr#timePickerDialogTheme android:timePickerDialogTheme}













     * attribute on the parent {@code context}'s theme.















     *















     * @param context the parent context















     * @param themeResId the resource ID of the theme to apply to this dialog









@@ -109,11 +116,6 @@ public class TimePickerDialog extends AlertDialog implements OnClickListener,













        mIs24HourView = is24HourView;































        final Context themeContext = getContext();









































        final TypedValue outValue = new TypedValue();













        context.getTheme().resolveAttribute(R.attr.timePickerDialogTheme, outValue, true);





























        final LayoutInflater inflater = LayoutInflater.from(themeContext);















        final View view = inflater.inflate(R.layout.time_picker_dialog, null);















        setView(view);









@@ -128,6 +130,15 @@ public class TimePickerDialog extends AlertDialog implements OnClickListener,













        mTimePicker.setOnTimeChangedListener(this);















    }





























    /**













     * @return the time picker displayed in the dialog













     * @hide For testing only.













     */













    @TestApi













    public TimePicker getTimePicker() {













        return mTimePicker;













    }





























    @Override















    public void onTimeChanged(TimePicker view, int hourOfDay, int minute) {















        /* do nothing */

































core/java/android/widget/DatePicker.java



+54
−4






























Original line number
Diff line number
Diff line








@@ -18,7 +18,9 @@ package android.widget;





























import com.android.internal.R;





























import android.annotation.IntDef;















import android.annotation.Nullable;













import android.annotation.TestApi;















import android.annotation.Widget;















import android.content.Context;















import android.content.res.Configuration;









@@ -33,6 +35,8 @@ import android.util.SparseArray;













import android.view.View;















import android.view.accessibility.AccessibilityEvent;





























import java.lang.annotation.Retention;













import java.lang.annotation.RetentionPolicy;















import java.util.Locale;































/**










@@ -76,11 +80,36 @@ import java.util.Locale;













 */















@Widget















public class DatePicker extends FrameLayout {













    private static final int MODE_SPINNER = 1;













    private static final int MODE_CALENDAR = 2;













    /**













     * Presentation mode for the Holo-style date picker that uses a set of













     * {@link android.widget.NumberPicker}s.













     *













     * @see #getMode()













     * @hide Visible for testing only.













     */













    @TestApi













    public static final int MODE_SPINNER = 1;



























    /**













     * Presentation mode for the Material-style date picker that uses a













     * calendar.













     *













     * @see #getMode()













     * @hide Visible for testing only.













     */













    @TestApi













    public static final int MODE_CALENDAR = 2;



























    /** @hide */













    @IntDef({MODE_SPINNER, MODE_CALENDAR})













    @Retention(RetentionPolicy.SOURCE)













    public @interface DatePickerMode {}































    private final DatePickerDelegate mDelegate;





























    @DatePickerMode













    private final int mMode;





























    /**















     * The callback used to indicate the user changed the date.















     */










@@ -115,11 +144,20 @@ public class DatePicker extends FrameLayout {





























        final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.DatePicker,















                defStyleAttr, defStyleRes);













        final int mode = a.getInt(R.styleable.DatePicker_datePickerMode, MODE_SPINNER);













        final boolean isDialogMode = a.getBoolean(R.styleable.DatePicker_dialogMode, false);













        final int requestedMode = a.getInt(R.styleable.DatePicker_datePickerMode, MODE_SPINNER);















        final int firstDayOfWeek = a.getInt(R.styleable.DatePicker_firstDayOfWeek, 0);















        a.recycle();





























        switch (mode) {













        if (requestedMode == MODE_CALENDAR && isDialogMode) {













            // You want MODE_CALENDAR? YOU CAN'T HANDLE MODE_CALENDAR! Well,













            // maybe you can depending on your screen size. Let's check...













            mMode = context.getResources().getInteger(R.integer.date_picker_mode);













        } else {













            mMode = requestedMode;













        }



























        switch (mMode) {















            case MODE_CALENDAR:















                mDelegate = createCalendarUIDelegate(context, attrs, defStyleAttr, defStyleRes);















                break;









@@ -145,6 +183,18 @@ public class DatePicker extends FrameLayout {













                defStyleRes);















    }





























    /**













     * @return the picker's presentation mode, one of {@link #MODE_CALENDAR} or













     *         {@link #MODE_SPINNER}













     * @attr ref android.R.styleable#DatePicker_datePickerMode













     * @hide Visible for testing only.













     */













    @DatePickerMode













    @TestApi













    public int getMode() {













        return mMode;













    }





























    /**















     * Initialize the state. If the provided values designate an inconsistent















     * date the values are normalized before updating the spinners.

































core/java/android/widget/TimePicker.java



+53
−4






























Original line number
Diff line number
Diff line








@@ -18,6 +18,7 @@ package android.widget;





























import com.android.internal.R;





























import android.annotation.IntDef;















import android.annotation.IntRange;















import android.annotation.NonNull;















import android.annotation.TestApi;









@@ -31,6 +32,8 @@ import android.util.MathUtils;













import android.view.View;















import android.view.accessibility.AccessibilityEvent;





























import java.lang.annotation.Retention;













import java.lang.annotation.RetentionPolicy;















import java.util.Locale;































import libcore.icu.LocaleData;









@@ -46,11 +49,36 @@ import libcore.icu.LocaleData;













 */















@Widget















public class TimePicker extends FrameLayout {













    private static final int MODE_SPINNER = 1;













    private static final int MODE_CLOCK = 2;













    /**













     * Presentation mode for the Holo-style time picker that uses a set of













     * {@link android.widget.NumberPicker}s.













     *













     * @see #getMode()













     * @hide Visible for testing only.













     */













    @TestApi













    public static final int MODE_SPINNER = 1;



























    /**













     * Presentation mode for the Material-style time picker that uses a clock













     * face.













     *













     * @see #getMode()













     * @hide Visible for testing only.













     */













    @TestApi













    public static final int MODE_CLOCK = 2;



























    /** @hide */













    @IntDef({MODE_SPINNER, MODE_CLOCK})













    @Retention(RetentionPolicy.SOURCE)













    public @interface TimePickerMode {}































    private final TimePickerDelegate mDelegate;





























    @TimePickerMode













    private final int mMode;





























    /**















     * The callback interface used to indicate the time has been adjusted.















     */










@@ -81,10 +109,19 @@ public class TimePicker extends FrameLayout {





























        final TypedArray a = context.obtainStyledAttributes(















                attrs, R.styleable.TimePicker, defStyleAttr, defStyleRes);













        final int mode = a.getInt(R.styleable.TimePicker_timePickerMode, MODE_SPINNER);













        final boolean isDialogMode = a.getBoolean(R.styleable.TimePicker_dialogMode, false);













        final int requestedMode = a.getInt(R.styleable.TimePicker_timePickerMode, MODE_SPINNER);















        a.recycle();





























        switch (mode) {













        if (requestedMode == MODE_CLOCK && isDialogMode) {













            // You want MODE_CLOCK? YOU CAN'T HANDLE MODE_CLOCK! Well, maybe













            // you can depending on your screen size. Let's check...













            mMode = context.getResources().getInteger(R.integer.time_picker_mode);













        } else {













            mMode = requestedMode;













        }



























        switch (mMode) {















            case MODE_CLOCK:















                mDelegate = new TimePickerClockDelegate(















                        this, context, attrs, defStyleAttr, defStyleRes);









@@ -97,6 +134,18 @@ public class TimePicker extends FrameLayout {













        }















    }





























    /**













     * @return the picker's presentation mode, one of {@link #MODE_CLOCK} or













     *         {@link #MODE_SPINNER}













     * @attr ref android.R.styleable#TimePicker_timePickerMode













     * @hide Visible for testing only.













     */













    @TimePickerMode













    @TestApi













    public int getMode() {













        return mMode;













    }





























    /**















     * Sets the currently selected hour using 24-hour time.















     *

































core/res/res/layout-sw600dp/date_picker_dialog.xml



+1
−1






























Original line number
Diff line number
Diff line








@@ -22,4 +22,4 @@













    android:layout_height="wrap_content"















    android:spinnersShown="true"















    android:calendarViewShown="true"













    android:datePickerMode="@integer/date_picker_mode" />












    android:dialogMode="true" />