am a009ee22: Merge "Reverse movement direction of DPAD events" into jb-mr1-aah-dev

* commit 'a009ee2261ee68d0d8c0efb6d1670ecb29252ba5':
  Reverse movement direction of DPAD events
This commit is contained in:
Justin Mattson
2012-10-08 12:55:15 -07:00
committed by Android Git Automerger

View File

@@ -948,13 +948,13 @@ public class NumberPicker extends LinearLayout {
}
switch (event.getAction()) {
case KeyEvent.ACTION_DOWN:
if (mWrapSelectorWheel || (keyCode == KeyEvent.KEYCODE_DPAD_UP)
if (mWrapSelectorWheel || (keyCode == KeyEvent.KEYCODE_DPAD_DOWN)
? getValue() < getMaxValue() : getValue() > getMinValue()) {
requestFocus();
mLastHandledDownDpadKeyCode = keyCode;
removeAllCallbacks();
if (mFlingScroller.isFinished()) {
changeValueByOne(keyCode == KeyEvent.KEYCODE_DPAD_UP);
changeValueByOne(keyCode == KeyEvent.KEYCODE_DPAD_DOWN);
}
return true;
}