Merge "Fix for IME exclusions not working with expanded bubble" into sc-dev (24de1aa8) · Commits · e / os / android_frameworks_base

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

+4 −7

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

		setOnApplyWindowInsetsListener((View view, WindowInsets insets) -> {
		if (!mIsExpanded \|\| mIsExpansionAnimating) {
		return view.onApplyWindowInsets(insets);
		}
		return view.onApplyWindowInsets(insets);
		});

		mOrientationChangedListener =
		(v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {
		mPositioner.update();
		@@ -2465,6 +2458,10 @@ public class BubbleStackView extends FrameLayout
		}
		} else {
		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) {

+5 −0

Original line number	Diff line number	Diff line
		@@ -529,6 +529,11 @@ public class StackAnimationController extends
		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
		* due to the IME going away.