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

Merge "Hide the stack education view when user taps" into sc-dev am: cdfc535609 am: 938929c329

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

Change-Id: I2ebefd6af194cdada9536d41871fd7c9555f103c
This commit is contained in:
Mady Mellor
2021-06-01 20:43:21 +00:00
committed by Automerger Merge Worker
parent fdaaab8934 938929c329
commit ab34e9bfae
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -938,6 +938,8 @@ public class BubbleStackView extends FrameLayout
if (ev.getAction() == MotionEvent.ACTION_DOWN) { if (ev.getAction() == MotionEvent.ACTION_DOWN) {
if (mShowingManage) { if (mShowingManage) {
showManageMenu(false /* show */); showManageMenu(false /* show */);
} else if (mStackEduView != null && mStackEduView.getVisibility() == VISIBLE) {
mStackEduView.hide(false);
} else if (mBubbleData.isExpanded()) { } else if (mBubbleData.isExpanded()) {
mBubbleData.setExpanded(false); mBubbleData.setExpanded(false);
} }
@@ -1152,6 +1154,7 @@ public class BubbleStackView extends FrameLayout
mStackEduView = new StackEducationView(mContext); mStackEduView = new StackEducationView(mContext);
addView(mStackEduView); addView(mStackEduView);
} }
mBubbleContainer.bringToFront();
return mStackEduView.show(mPositioner.getDefaultStartPosition()); return mStackEduView.show(mPositioner.getDefaultStartPosition());
} }