Merge "Collapse the stack on clicks rather than on down" into sc-dev am: fd4a4a3ee5 (302ab063) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java

+0 −21

Original line number	Diff line number	Diff line
		@@ -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.

+9 −13

Original line number	Diff line number	Diff line
		@@ -901,10 +901,9 @@ 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 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) {
		@@ -912,9 +911,6 @@ public class BubbleStackView extends FrameLayout
		} else if (mBubbleData.isExpanded()) {
		mBubbleData.setExpanded(false);
		}
		}

		return true;
		});

		animate()