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

Commit 6c113a14 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge "NubmberPicker up/down arrows do not work."

parents d36d653c 092bda57

core/java/android/widget/NumberPicker.java

+4 −1
Original line number Diff line number Diff line
@@ -608,7 +608,7 @@ public class NumberPicker extends LinearLayout { 
            case MotionEvent.ACTION_DOWN:

                mLastMotionEventY = mLastDownEventY = event.getY();

                removeAllCallbacks();

                hideInputControls();

                mShowInputControlsAnimator.cancel();

                mBeginEditOnUpEvent = false;

                mAdjustScrollerOnUpEvent = true;

                if (mDrawSelectorWheel) {
@@ -621,6 +621,7 @@ public class NumberPicker extends LinearLayout { 
                    }

                    mBeginEditOnUpEvent = scrollersFinished;

                    mAdjustScrollerOnUpEvent = true;

                    hideInputControls();

                    return true;

                }

                if (isEventInViewHitRect(event, mInputText)
@@ -630,6 +631,7 @@ public class NumberPicker extends LinearLayout { 
                                && isEventInViewHitRect(event, mDecrementButton))) {

                    mAdjustScrollerOnUpEvent = false;

                    setDrawSelectorWheel(true);

                    hideInputControls();

                    return true;

                }

                break;
@@ -640,6 +642,7 @@ public class NumberPicker extends LinearLayout { 
                    mBeginEditOnUpEvent = false;

                    onScrollStateChange(OnScrollListener.SCROLL_STATE_TOUCH_SCROLL);

                    setDrawSelectorWheel(true);

                    hideInputControls();

                    return true;

                }

                break;