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

Commit 7332701c authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Fix for IME exclusions not working with expanded bubble" into sc-dev... 

Merge "Fix for IME exclusions not working with expanded bubble" into sc-dev am: 24de1aa8 am: 65540bc7

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

Change-Id: I75e178b782497441210851ba4d32f52d161531e1
parents d36e17cf 65540bc7

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

+4 −7
Original line number Original line Diff line number Diff line
@@ -852,13 +852,6 @@ public class BubbleStackView extends FrameLayout 
        mTaskbarScrim.setAlpha(0f);

        mTaskbarScrim.setAlpha(0f);

        mTaskbarScrim.setVisibility(GONE);

        mTaskbarScrim.setVisibility(GONE);





        setOnApplyWindowInsetsListener((View view, WindowInsets insets) -> {

            if (!mIsExpanded || mIsExpansionAnimating) {

                return view.onApplyWindowInsets(insets);

            }

            return view.onApplyWindowInsets(insets);

        });



        mOrientationChangedListener =

        mOrientationChangedListener =

                (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {

                (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {

                    mPositioner.update();

                    mPositioner.update();
@@ -2465,6 +2458,10 @@ public class BubbleStackView extends FrameLayout 
            }

            }

        } else {

        } else {

            mBubbleContainer.getBoundsOnScreen(outRect);

            mBubbleContainer.getBoundsOnScreen(outRect);

            // Account for the IME in the touchable region so that the touchable region of the

            // Bubble window doesn't obscure the IME. The touchable region affects which areas

            // of the screen can be excluded by lower windows (IME is just above the embedded task)

            outRect.bottom -= (int) mStackAnimationController.getImeHeight();

        }

        }





        if (mFlyout.getVisibility() == View.VISIBLE) {

        if (mFlyout.getVisibility() == View.VISIBLE) {

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -529,6 +529,11 @@ public class StackAnimationController extends 
        mImeHeight = imeHeight;

        mImeHeight = imeHeight;

    }

    }





    /** Returns the current IME height that the stack is offset by. */

    public float getImeHeight() {

        return mImeHeight;

    }



    /**

    /**

     * Animates the stack either away from the newly visible IME, or back to its original position

     * Animates the stack either away from the newly visible IME, or back to its original position

     * due to the IME going away.

     * due to the IME going away.