Merge "The NumberPicker input cotrols are somtimes not shown."
diff --git a/core/java/android/widget/NumberPicker.java b/core/java/android/widget/NumberPicker.java
index 8e660ff..7a59178 100644
--- a/core/java/android/widget/NumberPicker.java
+++ b/core/java/android/widget/NumberPicker.java
@@ -608,6 +608,7 @@
case MotionEvent.ACTION_DOWN:
mLastMotionEventY = mLastDownEventY = event.getY();
removeAllCallbacks();
+ hideInputControls();
mBeginEditOnUpEvent = false;
mAdjustScrollerOnUpEvent = true;
if (mDrawSelectorWheel) {
@@ -620,7 +621,6 @@
}
mBeginEditOnUpEvent = scrollersFinished;
mAdjustScrollerOnUpEvent = true;
- hideInputControls();
return true;
}
if (isEventInViewHitRect(event, mInputText)
@@ -630,7 +630,6 @@
&& isEventInViewHitRect(event, mDecrementButton))) {
mAdjustScrollerOnUpEvent = false;
setDrawSelectorWheel(true);
- hideInputControls();
return true;
}
break;
@@ -641,7 +640,6 @@
mBeginEditOnUpEvent = false;
onScrollStateChange(OnScrollListener.SCROLL_STATE_TOUCH_SCROLL);
setDrawSelectorWheel(true);
- hideInputControls();
return true;
}
break;
@@ -1265,7 +1263,6 @@
}
}
- postAdjustScrollerCommand(flingScroller.getDuration());
invalidate();
}