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

Commit 4ad964d9 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Swap names for clock delegates so they are correct" into lmp-mr1-dev

parents 523a129c daf33ed8

core/java/android/widget/TimePicker.java

+2 −2
Original line number Diff line number Diff line
@@ -86,12 +86,12 @@ public class TimePicker extends FrameLayout { 


        switch (mode) {

            case MODE_CLOCK:

                mDelegate = new TimePickerSpinnerDelegate(

                mDelegate = new TimePickerClockDelegate(

                        this, context, attrs, defStyleAttr, defStyleRes);

                break;

            case MODE_SPINNER:

            default:

                mDelegate = new TimePickerClockDelegate(

                mDelegate = new TimePickerSpinnerDelegate(

                        this, context, attrs, defStyleAttr, defStyleRes);

                break;

        }

core/java/android/widget/TimePickerClockDelegate.java

+1062 −380

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/widget/TimePickerSpinnerDelegate.java

+380 −1062

File changed.

Preview size limit exceeded, changes collapsed.