Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix for IME exclusions not working with expanded bubble" into sc-dev

Browse Source
This commit is contained in:
Winson Chung
2021-06-09 17:35:35 +00:00
committed by Android (Google) Code Review
parent b87598c3cc 9f6c43e65c
commit 24de1aa861
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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
libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/animation/StackAnimationController.java
View File

@@ -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.