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

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

Merge "Fix touch intercept bug in ResolverDrawerLayout" into lmp-mr1-dev

parents f1f179a7 f0af0ea3

core/java/com/android/internal/widget/ResolverDrawerLayout.java

+3 −2
Original line number Diff line number Diff line
@@ -217,8 +217,9 @@ public class ResolverDrawerLayout extends ViewGroup { 
                mInitialTouchX = x;

                mInitialTouchY = mLastTouchY = y;

                mActivePointerId = ev.getPointerId(0);

                mIsDragging = findChildUnder(mInitialTouchX, mInitialTouchY) != null;

                handled = (!mIsDragging && mOnDismissedListener != null) || mCollapsibleHeight > 0;

                final boolean hitView = findChildUnder(mInitialTouchX, mInitialTouchY) != null;

                handled = (!hitView && mOnDismissedListener != null) || mCollapsibleHeight > 0;

                mIsDragging = hitView && handled;

                abortAnimation();

            }

            break;