| commit | f24c849c9d5fa58f3de61f9a1b28a46c3827a044 | [log] [tgz] |
|---|---|---|
| author | Mady Mellor <madym@google.com> | Tue Sep 17 19:01:15 2024 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Sep 17 19:01:15 2024 +0000 |
| tree | a9d1cb0263585e9c63ee5a45d2b2468a22f116c4 | |
| parent | 897fe25756b5fdb3ee06660e0e138ac6d264797f [diff] | |
| parent | 13431b15d7ff1bd20bdd4782832b09b4385f7d28 [diff] |
Merge "Fix an issue where animated the bubble bar twice from bubble button" into main
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java index c545d73..d253736 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java
@@ -2007,7 +2007,7 @@ @Override public void selectionChanged(BubbleViewProvider selectedBubble) { // Only need to update the layer view if we're currently expanded for selection changes. - if (mLayerView != null && isStackExpanded()) { + if (mLayerView != null && mLayerView.isExpanded()) { mLayerView.showExpandedView(selectedBubble); } }
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarLayerView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarLayerView.java index 1c9c195..1367b7e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarLayerView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarLayerView.java
@@ -186,6 +186,10 @@ if (expandedView == null) { return; } + if (mExpandedBubble != null && mIsExpanded && b.getKey().equals(mExpandedBubble.getKey())) { + // Already showing this bubble, skip animating + return; + } if (mExpandedBubble != null && !b.getKey().equals(mExpandedBubble.getKey())) { removeView(mExpandedView); mExpandedView = null;