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

Commit 25e9ace1 authored by Justin Mattson's avatar Justin Mattson Committed by Android Git Automerger
Browse files

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

* commit 'a009ee22':
  Reverse movement direction of DPAD events
parents e9d419f5 a009ee22

core/java/android/widget/NumberPicker.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

                        }