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

Commit dbb79273 authored by Mady Mellor's avatar Mady Mellor Committed by Android (Google) Code Review
Browse files

Merge "Fix bubbles IME alignment on tablet" into tm-dev

parents 582ba933 020aa384

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -692,6 +692,7 @@ public class BubbleExpandedView extends LinearLayout { 
     * @param bubblePosition the x position of the bubble if showing on top, the y position of

     * @param bubblePosition the x position of the bubble if showing on top, the y position of

     *                       the bubble if showing vertically.

     *                       the bubble if showing vertically.

     * @param onLeft whether the stack was on the left side of the screen when expanded.

     * @param onLeft whether the stack was on the left side of the screen when expanded.

     * @param animate whether the pointer should animate to this position.

     */

     */

    public void setPointerPosition(float bubblePosition, boolean onLeft, boolean animate) {

    public void setPointerPosition(float bubblePosition, boolean onLeft, boolean animate) {

        // Pointer gets drawn in the padding

        // Pointer gets drawn in the padding

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

+3 −4
Original line number Original line Diff line number Diff line
@@ -579,11 +579,10 @@ public class BubblePositioner { 




        // Showing vertically: might need to translate the bubbles above the IME.

        // Showing vertically: might need to translate the bubbles above the IME.

        // Subtract spacing here to provide a margin between top of IME and bottom of bubble row.

        // Subtract spacing here to provide a margin between top of IME and bottom of bubble row.

        final float bottomInset = getImeHeight() + mInsets.bottom - (mSpacingBetweenBubbles * 2);

        final float bottomHeight = getImeHeight() + mInsets.bottom - (mSpacingBetweenBubbles * 2);

        final float bottomInset = mScreenRect.bottom - bottomHeight;

        final float expandedStackSize = getExpandedStackSize(numberOfBubbles);

        final float expandedStackSize = getExpandedStackSize(numberOfBubbles);

        final float centerPosition = showBubblesVertically()

        final float centerPosition = mPositionRect.centerY();

                ? mPositionRect.centerY()

                : mPositionRect.centerX();

        final float rowBottom = centerPosition + (expandedStackSize / 2f);

        final float rowBottom = centerPosition + (expandedStackSize / 2f);

        final float rowTop = centerPosition - (expandedStackSize / 2f);

        final float rowTop = centerPosition - (expandedStackSize / 2f);

        float rowTopForIme = rowTop;

        float rowTopForIme = rowTop;