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

Commit 4feb9971 authored by PETER LIANG's avatar PETER LIANG Committed by Automerger Merge Worker
Browse files

Merge "Fix the menu on the left side should be moved out when clicking the... 

Merge "Fix the menu on the left side should be moved out when clicking the extra touch region." into sc-dev am: 5f210627 am: 647bb6a5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14540390

Change-Id: Ic189c174c0117a73524306d72f9d8017826cb399
parents 373577da 647bb6a5

packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/AccessibilityFloatingMenuView.java

+1 −2
Original line number Diff line number Diff line
@@ -544,9 +544,8 @@ public class AccessibilityFloatingMenuView extends FrameLayout 
        final int currentX = (int) event.getX();

        final int currentY = (int) event.getY();



        final int menuHalfWidth = getLayoutWidth() / 2;

        final Rect touchDelegateBounds =

                new Rect(mMargin, mMargin, mMargin + menuHalfWidth, mMargin + getLayoutHeight());

                new Rect(mMargin, mMargin, mMargin + getLayoutWidth(), mMargin + getLayoutHeight());

        if (action == MotionEvent.ACTION_DOWN

                && touchDelegateBounds.contains(currentX, currentY)) {

            mIsDownInEnlargedTouchArea = true;