Merge "Don't tell expanded controller about gestures unless we are expanded." into rvc-dev

2020-05-13 17:44:59 +00:00
parent 4d504ec83a 5578b7c9d9
commit 43d32906a8
1 changed files with 4 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
@@ -445,6 +445,10 @@ public class BubbleStackView extends FrameLayout
            final boolean clickedBubbleIsCurrentlyExpandedBubble =
                    clickedBubble.getKey().equals(mExpandedBubble.getKey());

+            if (isExpanded()) {
+                mExpandedAnimationController.onGestureFinished();
+            }
+
            if (isExpanded() && !clickedBubbleIsCurrentlyExpandedBubble) {
                if (clickedBubble != mBubbleData.getSelectedBubble()) {
                    // Select the clicked bubble.
@@ -464,7 +468,6 @@ public class BubbleStackView extends FrameLayout
                    mBubbleData.setExpanded(!mBubbleData.isExpanded());
                }
            }
-            mExpandedAnimationController.onGestureFinished();
        }
    };