diff options
2 files changed, 21 insertions, 1 deletions
diff --git a/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubblePositionerTest.kt b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubblePositionerTest.kt index 5825bbfbfefa..9cd14fca6a9d 100644 --- a/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubblePositionerTest.kt +++ b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubblePositionerTest.kt @@ -466,6 +466,26 @@ class BubblePositionerTest { .isEqualTo(expectedExpandedViewY) } + @Test + fun testGetTaskViewContentWidth_onLeft() { + positioner.update(defaultDeviceConfig.copy(insets = Insets.of(100, 0, 200, 0))) + val taskViewWidth = positioner.getTaskViewContentWidth(true /* onLeft */) + val paddings = positioner.getExpandedViewContainerPadding(true /* onLeft */, + false /* isOverflow */) + assertThat(taskViewWidth).isEqualTo( + positioner.screenRect.width() - paddings[0] - paddings[2]) + } + + @Test + fun testGetTaskViewContentWidth_onRight() { + positioner.update(defaultDeviceConfig.copy(insets = Insets.of(100, 0, 200, 0))) + val taskViewWidth = positioner.getTaskViewContentWidth(false /* onLeft */) + val paddings = positioner.getExpandedViewContainerPadding(false /* onLeft */, + false /* isOverflow */) + assertThat(taskViewWidth).isEqualTo( + positioner.screenRect.width() - paddings[0] - paddings[2]) + } + private val defaultYPosition: Float /** * Calculates the Y position bubbles should be placed based on the config. Based on the diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubblePositioner.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubblePositioner.java index cda29c95281d..a5853d621cb5 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubblePositioner.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubblePositioner.java @@ -395,7 +395,7 @@ public class BubblePositioner { public int getTaskViewContentWidth(boolean onLeft) { int[] paddings = getExpandedViewContainerPadding(onLeft, /* isOverflow = */ false); int pointerOffset = showBubblesVertically() ? getPointerSize() : 0; - return mPositionRect.width() - paddings[0] - paddings[2] - pointerOffset; + return mScreenRect.width() - paddings[0] - paddings[2] - pointerOffset; } /** Gets the y position of the expanded view if it was top-aligned. */ |