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

Commit dd388915 authored by Mark Renouf's avatar Mark Renouf Committed by Android (Google) Code Review
Browse files

Merge changes I9f107642,Ia8c19451 into qt-r1-bubbles-dev 

* changes:
  Notify of order change when selected bubble moved to top
  Skip notifyDisplayEmpty if no longer the selected bubble
parents 160b5bf9 6e4ddd7f

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

+0 −2
Original line number Diff line number Diff line
@@ -938,8 +938,6 @@ public class BubbleController implements ConfigurationController.ConfigurationLi 
            }

            if (expandedBubble.getDisplayId() == displayId) {

                mBubbleData.setExpanded(false);

            }

            if (expandedBubble.getExpandedView() != null) {

                expandedBubble.getExpandedView().notifyDisplayEmpty();

            }

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ public class BubbleData { 
                    // bubble remains on top.

                    mBubbles.remove(mSelectedBubble);

                    mBubbles.add(0, mSelectedBubble);

                    packGroup(0);

                    mStateChange.orderChanged |= packGroup(0);

                }

            }

        }