Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Collapse the stack on clicks rather than on down" into sc-dev am: fd4a4a3ee5

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

Change-Id: If46c3cc3c71058511b55c3abc99375ddda1d354a
This commit is contained in:
Mady Mellor
2021-06-09 18:04:12 +00:00
committed by Automerger Merge Worker
parent 65540bc717 fd4a4a3ee5
commit abfba98a67
2 changed files with 9 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -290,27 +290,6 @@ public class BubbleExpandedView extends LinearLayout {
applyThemeAttrs(); applyThemeAttrs();
setClipToPadding(false); 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 // BubbleStackView is forced LTR, but we want to respect the locale for expanded view layout
// so the Manage button appears on the right. // so the Manage button appears on the right.

22
libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java
View File

@@ -901,20 +901,16 @@ public class BubbleStackView extends FrameLayout
} }
}); });
// If the stack itself is touched, it means none of its touchable views (bubbles, flyouts, // If the stack itself is clicked, it means none of its touchable views (bubbles, flyouts,
// ActivityViews, etc.) were touched. Collapse the stack if it's expanded. // TaskView, etc.) were touched. Collapse the stack if it's expanded.
setOnTouchListener((view, ev) -> { setOnClickListener(view -> {
if (ev.getAction() == MotionEvent.ACTION_DOWN) { if (mShowingManage) {
if (mShowingManage) { showManageMenu(false /* show */);
showManageMenu(false /* show */); } else if (mStackEduView != null && mStackEduView.getVisibility() == VISIBLE) {
} else if (mStackEduView != null && mStackEduView.getVisibility() == VISIBLE) { mStackEduView.hide(false);
mStackEduView.hide(false); } else if (mBubbleData.isExpanded()) {
} else if (mBubbleData.isExpanded()) { mBubbleData.setExpanded(false);
mBubbleData.setExpanded(false);
}
} }
return true;
}); });
animate() animate()