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

Commit 47071990 authored by Liana Kazanova (xWF)'s avatar Liana Kazanova (xWF) Committed by Android (Google) Code Review
Browse files

Revert "Fix an issue where animated the bubble bar twice from bubble button" 

This reverts commit 13431b15.

Reason for revert: Droidmonitor: Potential culprit for http://b/367778476 - verifying through ABTD before submission. 

Change-Id: Ia3c8ed2c6136d34ca9e2000dc0454b7b4bd4a0c5
parent 13431b15

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

+1 −1
Original line number Diff line number Diff line
@@ -2007,7 +2007,7 @@ public class BubbleController implements ConfigurationChangeListener, 
        @Override

        public void selectionChanged(BubbleViewProvider selectedBubble) {

            // Only need to update the layer view if we're currently expanded for selection changes.

            if (mLayerView != null && mLayerView.isExpanded()) {

            if (mLayerView != null && isStackExpanded()) {

                mLayerView.showExpandedView(selectedBubble);

            }

        }

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarLayerView.java

+0 −4
Original line number Diff line number Diff line
@@ -186,10 +186,6 @@ public class BubbleBarLayerView extends FrameLayout 
        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;