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

Merge "Skip onTaskMovedToFront if the bubble selection is animating" into tm-dev am: 4008e21f0a

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

Change-Id: Ifd5cf291d2f4132a53032e090c5abc558a66dcf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mady Mellor
2022-04-15 16:57:00 +00:00
committed by Automerger Merge Worker
parent 112b82849e 4008e21f0a
commit 7eb42a3ea8
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java
View File

@@ -385,7 +385,9 @@ public class BubbleController {
mMainExecutor.execute(() -> { mMainExecutor.execute(() -> {
int expandedId = INVALID_TASK_ID; int expandedId = INVALID_TASK_ID;
if (mStackView != null && mStackView.getExpandedBubble() != null if (mStackView != null && mStackView.getExpandedBubble() != null
&& isStackExpanded() && !mStackView.isExpansionAnimating()) { && isStackExpanded()
&& !mStackView.isExpansionAnimating()
&& !mStackView.isSwitchAnimating()) {
expandedId = mStackView.getExpandedBubble().getTaskId(); expandedId = mStackView.getExpandedBubble().getTaskId();
} }
if (expandedId != INVALID_TASK_ID && expandedId != taskId) { if (expandedId != INVALID_TASK_ID && expandedId != taskId) {

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

@@ -1607,6 +1607,13 @@ public class BubbleStackView extends FrameLayout
return mIsExpansionAnimating; return mIsExpansionAnimating;
} }
/**
* Whether the stack of bubbles is animating a switch between bubbles.
*/
public boolean isSwitchAnimating() {
return mIsBubbleSwitchAnimating;
}
/** /**
* The {@link Bubble} that is expanded, null if one does not exist. * The {@link Bubble} that is expanded, null if one does not exist.
*/ */
@@ -2467,6 +2474,10 @@ public class BubbleStackView extends FrameLayout
private void dismissBubbleIfExists(@Nullable BubbleViewProvider bubble) { private void dismissBubbleIfExists(@Nullable BubbleViewProvider bubble) {
if (bubble != null && mBubbleData.hasBubbleInStackWithKey(bubble.getKey())) { if (bubble != null && mBubbleData.hasBubbleInStackWithKey(bubble.getKey())) {
if (mIsExpanded && mBubbleData.getBubbles().size() > 1) {
// If we have more than 1 bubble we will perform the switch animation
mIsBubbleSwitchAnimating = true;
}
mBubbleData.dismissBubbleWithKey(bubble.getKey(), Bubbles.DISMISS_USER_GESTURE); mBubbleData.dismissBubbleWithKey(bubble.getKey(), Bubbles.DISMISS_USER_GESTURE);
} }
} }