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

Commit 47d3f66a authored by Mady Mellor's avatar Mady Mellor
Browse files

Improve some issues around position and window order 

- which ever window was last created is on top, so if
  taskbar was just created, re-add bubbles window so
  its on top
- only set pinned location when the bar is visible

Test: manual
Bug: 173386799
Change-Id: I691f856947a094ba5a7afee611a95219fcca4830
parent 487244c2

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

+7 −3
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ public class BubbleController implements Bubbles { 


    // TODO(b/173386799) keep in sync with Launcher3 and also don't do a broadcast

    public static final String TASKBAR_CHANGED_BROADCAST = "taskbarChanged";

    public static final String EXTRA_TASKBAR_CREATED = "taskbarCreated";

    public static final String EXTRA_BUBBLE_OVERFLOW_OPENED = "bubbleOverflowOpened";

    public static final String EXTRA_TASKBAR_VISIBLE = "taskbarVisible";

    public static final String EXTRA_TASKBAR_POSITION = "taskbarPosition";
@@ -350,12 +351,15 @@ public class BubbleController implements Bubbles { 
                + " itemPosition: " + itemPosition[0] + "," + itemPosition[1]

                + " iconSize: " + iconSize);

        PointF point = new PointF(itemPosition[0], itemPosition[1]);

        mBubblePositioner.setPinnedLocation(point);

        mBubblePositioner.setPinnedLocation(isVisible ? point : null);

        mBubblePositioner.updateForTaskbar(iconSize, taskbarPosition, isVisible, taskbarSize);

        if (mStackView != null) {

            if (isVisible) {

                mStackView.updateStackPosition();

            if (isVisible && b.getBoolean(EXTRA_TASKBAR_CREATED, false /* default */)) {

                // If taskbar was created, add and remove the window so that bubbles display on top

                removeFromWindowManagerMaybe();

                addToWindowManagerMaybe();

            }

            mStackView.updateStackPosition();

            mBubbleIconFactory = new BubbleIconFactory(mContext);

            mStackView.onDisplaySizeChanged();

        }