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

Merge "Fix an issue where the selected bubble might move offscreen for IME" into tm-dev am: 41f1fc6474

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

Change-Id: I12cad15f3993703a03c77f32b923289a2f71ad32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mady Mellor
2022-04-11 18:51:47 +00:00
committed by Automerger Merge Worker
parent 432046743e 41f1fc6474
commit 5c66b2c0e4
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -557,7 +557,7 @@ public class BubblePositioner {
} }
if (showBubblesVertically() && mImeVisible) { if (showBubblesVertically() && mImeVisible) {
return new PointF(x, getExpandedBubbleYForIme(index, state.numberOfBubbles)); return new PointF(x, getExpandedBubbleYForIme(index, state));
} }
return new PointF(x, y); return new PointF(x, y);
} }
@@ -567,10 +567,10 @@ public class BubblePositioner {
* is showing. * is showing.
* *
* @param index the index of the bubble in the stack. * @param index the index of the bubble in the stack.
* @param numberOfBubbles the total number of bubbles in the stack. * @param state information about the stack state (# of bubbles, selected bubble).
* @return y position of the bubble on-screen when the stack is expanded. * @return y position of the bubble on-screen when the stack is expanded.
*/ */
private float getExpandedBubbleYForIme(int index, int numberOfBubbles) { private float getExpandedBubbleYForIme(int index, BubbleStackView.StackViewState state) {
final float top = getAvailableRect().top + mExpandedViewPadding; final float top = getAvailableRect().top + mExpandedViewPadding;
if (!showBubblesVertically()) { if (!showBubblesVertically()) {
// Showing horizontally: align to top // Showing horizontally: align to top
@@ -578,10 +578,10 @@ public class BubblePositioner {
} }
// Showing vertically: might need to translate the bubbles above the IME. // Showing vertically: might need to translate the bubbles above the IME.
// Subtract spacing here to provide a margin between top of IME and bottom of bubble row. // Add spacing here to provide a margin between top of IME and bottom of bubble row.
final float bottomHeight = getImeHeight() + mInsets.bottom - (mSpacingBetweenBubbles * 2); final float bottomHeight = getImeHeight() + mInsets.bottom + (mSpacingBetweenBubbles * 2);
final float bottomInset = mScreenRect.bottom - bottomHeight; final float bottomInset = mScreenRect.bottom - bottomHeight;
final float expandedStackSize = getExpandedStackSize(numberOfBubbles); final float expandedStackSize = getExpandedStackSize(state.numberOfBubbles);
final float centerPosition = mPositionRect.centerY(); final float centerPosition = mPositionRect.centerY();
final float rowBottom = centerPosition + (expandedStackSize / 2f); final float rowBottom = centerPosition + (expandedStackSize / 2f);
final float rowTop = centerPosition - (expandedStackSize / 2f); final float rowTop = centerPosition - (expandedStackSize / 2f);
@@ -593,7 +593,7 @@ public class BubblePositioner {
if (rowTop - translationY < top) { if (rowTop - translationY < top) {
// Even if we shift the bubbles, they will still overlap with the IME. // Even if we shift the bubbles, they will still overlap with the IME.
// Hide the overflow for a lil more space: // Hide the overflow for a lil more space:
final float expandedStackSizeNoO = getExpandedStackSize(numberOfBubbles - 1); final float expandedStackSizeNoO = getExpandedStackSize(state.numberOfBubbles - 1);
final float centerPositionNoO = showBubblesVertically() final float centerPositionNoO = showBubblesVertically()
? mPositionRect.centerY() ? mPositionRect.centerY()
: mPositionRect.centerX(); : mPositionRect.centerX();
@@ -603,6 +603,13 @@ public class BubblePositioner {
rowTopForIme = rowTopNoO - translationY; rowTopForIme = rowTopNoO - translationY;
} }
} }
// Check if the selected bubble is within the appropriate space
final float selectedPosition = rowTopForIme
+ (state.selectedIndex * (mBubbleSize + mSpacingBetweenBubbles));
if (selectedPosition < top) {
// We must always keep the selected bubble in view so we'll have to allow more overlap.
rowTopForIme = top;
}
return rowTopForIme + (index * (mBubbleSize + mSpacingBetweenBubbles)); return rowTopForIme + (index * (mBubbleSize + mSpacingBetweenBubbles));
} }