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

Commit 0519fbc3 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: I1847f3dd60426b529b562d514e9470b6286f576d
parents d3dac5c2 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();

        }

    };