Merge "Fix bubble expanded view jumping to the left when switching bubbles" into tm-dev (3d69ea8e) · Commits · e / os / android_frameworks_base

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) {

+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 =