diff options
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java | 21 | ||||
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java | 22 |
2 files changed, 9 insertions, 34 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java index b674c68b2490..f81f086e598f 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java @@ -290,27 +290,6 @@ public class BubbleExpandedView extends LinearLayout { applyThemeAttrs(); setClipToPadding(false); - setOnTouchListener((view, motionEvent) -> { - if (mTaskView == null) { - return false; - } - - final Rect avBounds = new Rect(); - mTaskView.getBoundsOnScreen(avBounds); - - // Consume and ignore events on the expanded view padding that are within the - // ActivityView's vertical bounds. These events are part of a back gesture, and so they - // should not collapse the stack (which all other touches on areas around the AV would - // do). - if (motionEvent.getRawY() >= avBounds.top - && motionEvent.getRawY() <= avBounds.bottom - && (motionEvent.getRawX() < avBounds.left - || motionEvent.getRawX() > avBounds.right)) { - return true; - } - - return false; - }); // BubbleStackView is forced LTR, but we want to respect the locale for expanded view layout // so the Manage button appears on the right. diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java index 786772446325..16b8150467fd 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java @@ -901,20 +901,16 @@ public class BubbleStackView extends FrameLayout } }); - // If the stack itself is touched, it means none of its touchable views (bubbles, flyouts, - // ActivityViews, etc.) were touched. Collapse the stack if it's expanded. - setOnTouchListener((view, ev) -> { - if (ev.getAction() == MotionEvent.ACTION_DOWN) { - if (mShowingManage) { - showManageMenu(false /* show */); - } else if (mStackEduView != null && mStackEduView.getVisibility() == VISIBLE) { - mStackEduView.hide(false); - } else if (mBubbleData.isExpanded()) { - mBubbleData.setExpanded(false); - } + // If the stack itself is clicked, it means none of its touchable views (bubbles, flyouts, + // TaskView, etc.) were touched. Collapse the stack if it's expanded. + setOnClickListener(view -> { + if (mShowingManage) { + showManageMenu(false /* show */); + } else if (mStackEduView != null && mStackEduView.getVisibility() == VISIBLE) { + mStackEduView.hide(false); + } else if (mBubbleData.isExpanded()) { + mBubbleData.setExpanded(false); } - - return true; }); animate() |