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

diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleTouchHandler.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleTouchHandler.java
index 0d8cb63..baeedaa 100644 (file)
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleTouchHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleTouchHandler.java
@@ -97,11 +97,13 @@ class BubbleTouchHandler implements View.OnTouchListener {
             case MotionEvent.ACTION_DOWN:
                 trackMovement(event);
 
-                mDismissViewController.createDismissTarget();
-                mHandler.postDelayed(mShowDismissAffordance, SHOW_TARGET_DELAY);
-
                 mTouchDown.set(rawX, rawY);
 
+                if (!isFlyout) {
+                    mDismissViewController.createDismissTarget();
+                    mHandler.postDelayed(mShowDismissAffordance, SHOW_TARGET_DELAY);
+                }
+
                 if (isStack) {
                     mViewPositionOnTouchDown.set(mStack.getStackPosition());
                     mStack.onDragStart();
@@ -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) {