Revert "Allow bar to be transparent if letterbox contains bar"
This reverts commit 39f818c76cf5a2aadee26f3c0905919656a0352b.
Reason for revert: Breaks LIGHT_STATUS/NAVIGATION_BAR with LAYOUT_IN_CUTOUT_MODE_NEVER
Bug: 152273579
Bug: 159627574
Bug: 156301377
Test: Receive call on device with a cutout, verify status bar has icons
Change-Id: I4de084c86ba234fec586e9cd140138a47ed5d87a
diff --git a/services/core/java/com/android/server/policy/WindowManagerPolicy.java b/services/core/java/com/android/server/policy/WindowManagerPolicy.java
index b3e162d..8868a6c 100644
--- a/services/core/java/com/android/server/policy/WindowManagerPolicy.java
+++ b/services/core/java/com/android/server/policy/WindowManagerPolicy.java
@@ -396,6 +396,14 @@
return false;
}
+ /**
+ * Returns true if the window has a letterbox and any part of that letterbox overlaps with
+ * the given {@code rect}.
+ */
+ default boolean isLetterboxedOverlappingWith(Rect rect) {
+ return false;
+ }
+
/** @return the current windowing mode of this window. */
int getWindowingMode();
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index 360e40b..40e558c 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -1395,10 +1395,11 @@
}
/**
- * @see Letterbox#notIntersectsOrFullyContains(Rect)
+ * @return {@code true} if there is a letterbox and any part of that letterbox overlaps with
+ * the given {@code rect}.
*/
- boolean letterboxNotIntersectsOrFullyContains(Rect rect) {
- return mLetterbox == null || mLetterbox.notIntersectsOrFullyContains(rect);
+ boolean isLetterboxOverlappingWith(Rect rect) {
+ return mLetterbox != null && mLetterbox.isOverlappingWith(rect);
}
static class Token extends IApplicationToken.Stub {
diff --git a/services/core/java/com/android/server/wm/BarController.java b/services/core/java/com/android/server/wm/BarController.java
index 26e0790..123fb6c 100644
--- a/services/core/java/com/android/server/wm/BarController.java
+++ b/services/core/java/com/android/server/wm/BarController.java
@@ -175,7 +175,7 @@
}
final Rect rotatedContentFrame = win.mToken.getFixedRotationBarContentFrame(mWindowType);
final Rect contentFrame = rotatedContentFrame != null ? rotatedContentFrame : mContentFrame;
- return win.letterboxNotIntersectsOrFullyContains(contentFrame);
+ return !win.isLetterboxedOverlappingWith(contentFrame);
}
boolean setBarShowingLw(final boolean show) {
diff --git a/services/core/java/com/android/server/wm/Letterbox.java b/services/core/java/com/android/server/wm/Letterbox.java
index 5d1c85d..a685886 100644
--- a/services/core/java/com/android/server/wm/Letterbox.java
+++ b/services/core/java/com/android/server/wm/Letterbox.java
@@ -77,10 +77,10 @@
mOuter.set(outer);
mInner.set(inner);
- mTop.layout(outer.left, outer.top, outer.right, inner.top, surfaceOrigin);
- mLeft.layout(outer.left, outer.top, inner.left, outer.bottom, surfaceOrigin);
- mBottom.layout(outer.left, inner.bottom, outer.right, outer.bottom, surfaceOrigin);
- mRight.layout(inner.right, outer.top, outer.right, outer.bottom, surfaceOrigin);
+ mTop.layout(outer.left, outer.top, inner.right, inner.top, surfaceOrigin);
+ mLeft.layout(outer.left, inner.top, inner.left, outer.bottom, surfaceOrigin);
+ mBottom.layout(inner.left, inner.bottom, outer.right, outer.bottom, surfaceOrigin);
+ mRight.layout(inner.right, outer.top, outer.right, inner.bottom, surfaceOrigin);
}
@@ -101,29 +101,17 @@
}
/**
- * Returns {@code true} if the letterbox does not overlap with the bar, or the letterbox can
- * fully cover the window frame.
- *
- * @param rect The area of the window frame.
+ * Returns true if any part of the letterbox overlaps with the given {@code rect}.
*/
- boolean notIntersectsOrFullyContains(Rect rect) {
- int emptyCount = 0;
- int noOverlappingCount = 0;
+ public boolean isOverlappingWith(Rect rect) {
for (LetterboxSurface surface : mSurfaces) {
- final Rect surfaceRect = surface.mLayoutFrameGlobal;
- if (surfaceRect.isEmpty()) {
- // empty letterbox
- emptyCount++;
- } else if (!Rect.intersects(surfaceRect, rect)) {
- // no overlapping
- noOverlappingCount++;
- } else if (surfaceRect.contains(rect)) {
- // overlapping and covered
+ if (surface.isOverlappingWith(rect)) {
return true;
}
}
- return (emptyCount + noOverlappingCount) == mSurfaces.length;
+ return false;
}
+
/**
* Hides the letterbox.
*
@@ -298,6 +286,17 @@
return Math.max(0, mLayoutFrameGlobal.height());
}
+ /**
+ * Returns if the given {@code rect} overlaps with this letterbox piece.
+ * @param rect the area to check for overlap in global coordinates
+ */
+ public boolean isOverlappingWith(Rect rect) {
+ if (mLayoutFrameGlobal.isEmpty()) {
+ return false;
+ }
+ return Rect.intersects(rect, mLayoutFrameGlobal);
+ }
+
public void applySurfaceChanges(SurfaceControl.Transaction t) {
if (mSurfaceFrameRelative.equals(mLayoutFrameRelative)) {
// Nothing changed.
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index 00be75f..26bcf3b 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -3797,12 +3797,9 @@
return mActivityRecord.getBounds().equals(mTmpRect);
}
- /**
- * @see Letterbox#notIntersectsOrFullyContains(Rect)
- */
- boolean letterboxNotIntersectsOrFullyContains(Rect rect) {
- return mActivityRecord == null
- || mActivityRecord.letterboxNotIntersectsOrFullyContains(rect);
+ @Override
+ public boolean isLetterboxedOverlappingWith(Rect rect) {
+ return mActivityRecord != null && mActivityRecord.isLetterboxOverlappingWith(rect);
}
boolean isDragResizeChanged() {
diff --git a/services/tests/wmtests/src/com/android/server/wm/LetterboxTest.java b/services/tests/wmtests/src/com/android/server/wm/LetterboxTest.java
index ce3f270..bf84aec 100644
--- a/services/tests/wmtests/src/com/android/server/wm/LetterboxTest.java
+++ b/services/tests/wmtests/src/com/android/server/wm/LetterboxTest.java
@@ -16,7 +16,6 @@
package com.android.server.wm;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
@@ -55,102 +54,10 @@
mTransaction = spy(StubTransaction.class);
}
- private static final int TOP_BAR = 0x1;
- private static final int BOTTOM_BAR = 0x2;
- private static final int LEFT_BAR = 0x4;
- private static final int RIGHT_BAR = 0x8;
-
@Test
- public void testNotIntersectsOrFullyContains_usesGlobalCoordinates() {
- final Rect outer = new Rect(0, 0, 10, 50);
- final Point surfaceOrig = new Point(1000, 2000);
-
- final Rect topBar = new Rect(0, 0, 10, 2);
- final Rect bottomBar = new Rect(0, 45, 10, 50);
- final Rect leftBar = new Rect(0, 0, 2, 50);
- final Rect rightBar = new Rect(8, 0, 10, 50);
-
- final LetterboxLayoutVerifier verifier =
- new LetterboxLayoutVerifier(outer, surfaceOrig, mLetterbox);
- verifier.setBarRect(topBar, bottomBar, leftBar, rightBar);
-
- // top
- verifier.setInner(0, 2, 10, 50).verifyPositions(TOP_BAR | BOTTOM_BAR, BOTTOM_BAR);
- // bottom
- verifier.setInner(0, 0, 10, 45).verifyPositions(TOP_BAR | BOTTOM_BAR, TOP_BAR);
- // left
- verifier.setInner(2, 0, 10, 50).verifyPositions(LEFT_BAR | RIGHT_BAR, RIGHT_BAR);
- // right
- verifier.setInner(0, 0, 8, 50).verifyPositions(LEFT_BAR | RIGHT_BAR, LEFT_BAR);
- // top + bottom
- verifier.setInner(0, 2, 10, 45).verifyPositions(TOP_BAR | BOTTOM_BAR, 0);
- // left + right
- verifier.setInner(2, 0, 8, 50).verifyPositions(LEFT_BAR | RIGHT_BAR, 0);
- // top + left
- verifier.setInner(2, 2, 10, 50).verifyPositions(TOP_BAR | LEFT_BAR, 0);
- // top + left + right
- verifier.setInner(2, 2, 8, 50).verifyPositions(TOP_BAR | LEFT_BAR | RIGHT_BAR, 0);
- // left + right + bottom
- verifier.setInner(2, 0, 8, 45).verifyPositions(LEFT_BAR | RIGHT_BAR | BOTTOM_BAR, 0);
- // all
- verifier.setInner(2, 2, 8, 45)
- .verifyPositions(TOP_BAR | BOTTOM_BAR | LEFT_BAR | RIGHT_BAR, 0);
- }
-
- private static class LetterboxLayoutVerifier {
- final Rect mOuter;
- final Rect mInner = new Rect();
- final Point mSurfaceOrig;
- final Letterbox mLetterbox;
- final Rect mTempRect = new Rect();
-
- final Rect mTop = new Rect();
- final Rect mBottom = new Rect();
- final Rect mLeft = new Rect();
- final Rect mRight = new Rect();
-
- LetterboxLayoutVerifier(Rect outer, Point surfaceOrig, Letterbox letterbox) {
- mOuter = new Rect(outer);
- mSurfaceOrig = new Point(surfaceOrig);
- mLetterbox = letterbox;
- }
-
- LetterboxLayoutVerifier setInner(int left, int top, int right, int bottom) {
- mInner.set(left, top, right, bottom);
- mLetterbox.layout(mOuter, mInner, mSurfaceOrig);
- return this;
- }
-
- void setBarRect(Rect top, Rect bottom, Rect left, Rect right) {
- mTop.set(top);
- mBottom.set(bottom);
- mLeft.set(left);
- mRight.set(right);
- }
-
- void verifyPositions(int allowedPos, int noOverlapPos) {
- assertEquals(mLetterbox.notIntersectsOrFullyContains(mTop),
- (allowedPos & TOP_BAR) != 0);
- assertEquals(mLetterbox.notIntersectsOrFullyContains(mBottom),
- (allowedPos & BOTTOM_BAR) != 0);
- assertEquals(mLetterbox.notIntersectsOrFullyContains(mLeft),
- (allowedPos & LEFT_BAR) != 0);
- assertEquals(mLetterbox.notIntersectsOrFullyContains(mRight),
- (allowedPos & RIGHT_BAR) != 0);
-
- mTempRect.set(mTop.left, mTop.top, mTop.right, mTop.bottom + 1);
- assertEquals(mLetterbox.notIntersectsOrFullyContains(mTempRect),
- (noOverlapPos & TOP_BAR) != 0);
- mTempRect.set(mLeft.left, mLeft.top, mLeft.right + 1, mLeft.bottom);
- assertEquals(mLetterbox.notIntersectsOrFullyContains(mTempRect),
- (noOverlapPos & LEFT_BAR) != 0);
- mTempRect.set(mRight.left - 1, mRight.top, mRight.right, mRight.bottom);
- assertEquals(mLetterbox.notIntersectsOrFullyContains(mTempRect),
- (noOverlapPos & RIGHT_BAR) != 0);
- mTempRect.set(mBottom.left, mBottom.top - 1, mBottom.right, mBottom.bottom);
- assertEquals(mLetterbox.notIntersectsOrFullyContains(mTempRect),
- (noOverlapPos & BOTTOM_BAR) != 0);
- }
+ public void testOverlappingWith_usesGlobalCoordinates() {
+ mLetterbox.layout(new Rect(0, 0, 10, 50), new Rect(0, 2, 10, 45), new Point(1000, 2000));
+ assertTrue(mLetterbox.isOverlappingWith(new Rect(0, 0, 1, 1)));
}
@Test