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

Commit 440771d1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix an issue with bubbles overlapping the taskbar" into sc-v2-dev am:... 

Merge "Fix an issue with bubbles overlapping the taskbar" into sc-v2-dev am: 99ce862e am: 337d25b2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15747691

Change-Id: I39d118a502de4581bae2acdca9cc0e3f610d52ae
parents a5e61a25 337d25b2

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

+5 −2
Original line number Diff line number Diff line
@@ -628,8 +628,11 @@ public class BubbleController { 
            mAddedToWindowManager = true;

            mBubbleData.getOverflow().initialize(this);

            mWindowManager.addView(mStackView, mWmLayoutParams);

            // Position info is dependent on us being attached to a window

            mStackView.setOnApplyWindowInsetsListener((view, windowInsets) -> {

                mBubblePositioner.update();

                mStackView.onDisplaySizeChanged();

                return windowInsets;

            });

        } catch (IllegalStateException e) {

            // This means the stack has already been added. This shouldn't happen...

            e.printStackTrace();

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

+1 −0
Original line number Diff line number Diff line
@@ -1315,6 +1315,7 @@ public class BubbleStackView extends FrameLayout 
    @Override

    protected void onAttachedToWindow() {

        super.onAttachedToWindow();

        mPositioner.update();

        getViewTreeObserver().addOnComputeInternalInsetsListener(this);

        getViewTreeObserver().addOnDrawListener(mSystemGestureExcludeUpdater);

    }