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

Commit 834dad1f authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "No need to use getExpandedBubble for... 

Merge "Merge "No need to use getExpandedBubble for singleTaskDisplayDrawn/Empty callbacks" into qt-qpr1-dev am: 4ac6a113" into qt-qpr1-dev-plus-aosp
parents bc50edef 1e5da3f8

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

+6 −2
Original line number Diff line number Diff line
@@ -926,7 +926,9 @@ public class BubbleController implements ConfigurationController.ConfigurationLi 


        @Override

        public void onSingleTaskDisplayDrawn(int displayId) {

            final Bubble expandedBubble = getExpandedBubble(mContext);

            final Bubble expandedBubble = mStackView != null

                    ? mStackView.getExpandedBubble()

                    : null;

            if (expandedBubble != null && expandedBubble.getDisplayId() == displayId) {

                expandedBubble.setContentVisibility(true);

            }
@@ -934,7 +936,9 @@ public class BubbleController implements ConfigurationController.ConfigurationLi 


        @Override

        public void onSingleTaskDisplayEmpty(int displayId) {

            final Bubble expandedBubble = getExpandedBubble(mContext);

            final Bubble expandedBubble = mStackView != null

                    ? mStackView.getExpandedBubble()

                    : null;

            if (expandedBubble == null) {

                return;

            }