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

Commit 032f0520 authored by Joshua Tsuji's avatar Joshua Tsuji Committed by Josh Tsuji
Browse files

Don't show the dismiss target if trying to drag the flyout. 

Also, make dragging the flyout a no-op until the gesture is added. Tapping still expands the bubbles.

Test: manual
Change-Id: Ida96465e3db923e0b08a0cf0cf41dd97cddbe606
parent 614b1df0

packages/SystemUI/src/com/android/systemui/bubbles/BubbleTouchHandler.java

+6 −4
Original line number Diff line number Diff line
@@ -97,10 +97,12 @@ class BubbleTouchHandler implements View.OnTouchListener { 
            case MotionEvent.ACTION_DOWN:

                trackMovement(event);



                mTouchDown.set(rawX, rawY);



                if (!isFlyout) {

                    mDismissViewController.createDismissTarget();

                    mHandler.postDelayed(mShowDismissAffordance, SHOW_TARGET_DELAY);



                mTouchDown.set(rawX, rawY);

                }



                if (isStack) {

                    mViewPositionOnTouchDown.set(mStack.getStackPosition());
@@ -148,7 +150,7 @@ class BubbleTouchHandler implements View.OnTouchListener { 
                    mController.dismissStack(BubbleController.DISMISS_USER_GESTURE);

                } else if (isFlyout) {

                    // TODO(b/129768381): Expand if tapped, dismiss if swiped away.

                    if (!mStack.isExpanded()) {

                    if (!mStack.isExpanded() && !mMovedEnough) {

                        mStack.expandStack();

                    }

                } else if (mMovedEnough) {