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

Commit 1dd84d5f authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Keyguard sliding challenge - fix overeager touch interception" into jb-mr1-lockscreen-dev

parents 998a504c c238af51

policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java

+5 −5
Original line number Diff line number Diff line
@@ -584,8 +584,8 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout 
                                && ((isInDragHandle(x, y) && MathUtils.sq(x - mGestureStartX)

                                        + MathUtils.sq(y - mGestureStartY) > mTouchSlopSquare)

                                || crossedDragHandle(x, y, mGestureStartY)

                               || (isInChallengeView(x, y) && (mScrollState == SCROLL_STATE_SETTLING

                                       || !mChallengeShowing)))) {

                                || (isInChallengeView(x, y) &&

                                       mScrollState == SCROLL_STATE_SETTLING))) {

                        mActivePointerId = ev.getPointerId(i);

                        mGestureStartX = x;

                        mGestureStartY = y;