Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98b9b406 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't tell expanded controller about gestures unless we are expanded."... 

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

Change-Id: Id4760236997f55f979572fa84197555ff5864c0c
parents 6e17cddd 43d32906

packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java

+4 −1
Original line number Diff line number Diff line
@@ -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();

        }

    };