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

Commit 6b26d727 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix bubble expanded view jumping to the left when switching bubbles"... 

Merge "Fix bubble expanded view jumping to the left when switching bubbles" into tm-dev am: 3d69ea8e am: 784245cb

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



Change-Id: Ic978758c4384483c2c61557b2f86f48623656e04
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1ae31371 784245cb

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

+6 −1
Original line number Diff line number Diff line
@@ -329,6 +329,11 @@ public class BubblePositioner { 
                : mBubbleSize;

    }



    /** Size of the visible (non-overlapping) part of the pointer. */

    public int getPointerSize() {

        return mPointerHeight - mPointerOverlap;

    }



    /** The maximum number of bubbles that can be displayed comfortably on screen. */

    public int getMaxBubbles() {

        return mMaxBubbles;
@@ -367,7 +372,7 @@ public class BubblePositioner { 
     * padding is added.

     */

    public int[] getExpandedViewContainerPadding(boolean onLeft, boolean isOverflow) {

        final int pointerTotalHeight = mPointerHeight - mPointerOverlap;

        final int pointerTotalHeight = getPointerSize();

        final int expandedViewLargeScreenInsetFurthestEdge =

                getExpandedViewLargeScreenInsetFurthestEdge(isOverflow);

        if (mIsLargeScreen) {

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

+4 −1
Original line number Diff line number Diff line
@@ -2887,7 +2887,10 @@ public class BubbleStackView extends FrameLayout 
        PhysicsAnimator.getInstance(mAnimatingOutSurfaceContainer).cancel();

        mAnimatingOutSurfaceContainer.setScaleX(1f);

        mAnimatingOutSurfaceContainer.setScaleY(1f);

        mAnimatingOutSurfaceContainer.setTranslationX(mExpandedViewContainer.getPaddingLeft());

        final float translationX = mPositioner.showBubblesVertically() && mStackOnLeftOrWillBe

                ? mExpandedViewContainer.getPaddingLeft() + mPositioner.getPointerSize()

                : mExpandedViewContainer.getPaddingLeft();

        mAnimatingOutSurfaceContainer.setTranslationX(translationX);

        mAnimatingOutSurfaceContainer.setTranslationY(0);



        final int[] taskViewLocation =