Merge "Fix bubble position with IME when the bubble has a custom height" into tm-dev (71163eee) · Commits · e / os / android_frameworks_base

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -112,6 +112,7 @@ public class BubbleExpandedView extends LinearLayout {
		private ShapeDrawable mRightPointer;
		private float mCornerRadius = 0f;
		private int mBackgroundColorFloating;
		private boolean mUsingMaxHeight;

		@Nullable private Bubble mBubble;
		private PendingIntent mPendingIntent;
		@@ -621,6 +622,13 @@ public class BubbleExpandedView extends LinearLayout {
		return prevWasIntentBased != newIsIntentBased;
		}

		/**
		* Whether the bubble is using all available height to display or not.
		*/
		public boolean isUsingMaxHeight() {
		return mUsingMaxHeight;
		}

		void updateHeight() {
		if (mExpandedViewContainerLocation == null) {
		return;
		@@ -632,6 +640,7 @@ public class BubbleExpandedView extends LinearLayout {
		float height = desiredHeight == MAX_HEIGHT
		? maxHeight
		: Math.min(desiredHeight, maxHeight);
		mUsingMaxHeight = height == maxHeight;
		FrameLayout.LayoutParams lp = mIsOverflow
		? (FrameLayout.LayoutParams) mOverflowView.getLayoutParams()
		: (FrameLayout.LayoutParams) mTaskView.getLayoutParams();

+7 −0

Original line number	Diff line number	Diff line
		@@ -2355,7 +2355,14 @@ public class BubbleStackView extends FrameLayout
		}
		} else if (mPositioner.showBubblesVertically() && mIsExpanded
		&& mExpandedBubble != null && mExpandedBubble.getExpandedView() != null) {
		float selectedY = mPositioner.getExpandedBubbleXY(getState().selectedIndex,
		getState()).y;
		float newExpandedViewTop = mPositioner.getExpandedViewY(mExpandedBubble, selectedY);
		mExpandedBubble.getExpandedView().setImeVisible(visible);
		if (!mExpandedBubble.getExpandedView().isUsingMaxHeight()) {
		mExpandedViewContainer.animate().translationY(newExpandedViewTop);
		}

		List<Animator> animList = new ArrayList();
		for (int i = 0; i < mBubbleContainer.getChildCount(); i++) {
		View child = mBubbleContainer.getChildAt(i);