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

Commit b7d3ffef authored by Robert Chou's avatar Robert Chou Committed by android-build-merger
Browse files

Merge "Resolve NumberPicker display abnormal issue." am: 434e4fdf 

am: 17c0df4a

Change-Id: Idd61b68dc773114fe09fcd7f8aebd1043c1a838d
parents fd91098d 17c0df4a

core/java/android/widget/NumberPicker.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -922,10 +922,12 @@ public class NumberPicker extends LinearLayout { 
                if (!mFlingScroller.isFinished()) {

                if (!mFlingScroller.isFinished()) {

                    mFlingScroller.forceFinished(true);

                    mFlingScroller.forceFinished(true);

                    mAdjustScroller.forceFinished(true);

                    mAdjustScroller.forceFinished(true);

                    onScrollerFinished(mFlingScroller);

                    onScrollStateChange(OnScrollListener.SCROLL_STATE_IDLE);

                    onScrollStateChange(OnScrollListener.SCROLL_STATE_IDLE);

                } else if (!mAdjustScroller.isFinished()) {

                } else if (!mAdjustScroller.isFinished()) {

                    mFlingScroller.forceFinished(true);

                    mFlingScroller.forceFinished(true);

                    mAdjustScroller.forceFinished(true);

                    mAdjustScroller.forceFinished(true);

                    onScrollerFinished(mAdjustScroller);

                } else if (mLastDownEventY < mTopSelectionDividerTop) {

                } else if (mLastDownEventY < mTopSelectionDividerTop) {

                    postChangeCurrentByOneFromLongPress(

                    postChangeCurrentByOneFromLongPress(

                            false, ViewConfiguration.getLongPressTimeout());

                            false, ViewConfiguration.getLongPressTimeout());