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

Merge "Fix letterbox overlapping with status bar icons after rotating device" into udc-dev

Browse Source
This commit is contained in:
Christian Göllner
2023-06-28 08:54:00 +00:00
committed by Android (Google) Code Review
parent 7c9c5f29f7 5e46200477
commit c615401f23
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/statusbar/phone/LetterboxAppearanceCalculator.kt
View File

@@ -209,7 +209,7 @@ constructor(
if (this.contains(other) || other.contains(this)) { if (this.contains(other) || other.contains(this)) {
return false return false
} }
return this.intersect(other) return this.intersects(other.left, other.top, other.right, other.bottom)
} }
override fun dump(pw: PrintWriter, args: Array<out String>) { override fun dump(pw: PrintWriter, args: Array<out String>) {

24
packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/LetterboxAppearanceCalculatorTest.kt
View File

@@ -105,6 +105,30 @@ class LetterboxAppearanceCalculatorTest : SysuiTestCase() {
expect.that(letterboxAppearance.appearanceRegions).isEqualTo(TEST_APPEARANCE_REGIONS) expect.that(letterboxAppearance.appearanceRegions).isEqualTo(TEST_APPEARANCE_REGIONS)
} }
/** Regression test for b/287508741 */
@Test
fun getLetterboxAppearance_withOverlap_doesNotMutateOriginalBounds() {
val statusBarStartSideBounds = Rect(left = 0, top = 0, right = 100, bottom = 100)
val statusBarEndSideBounds = Rect(left = 200, top = 0, right = 300, bottom = 100)
val letterBoxInnerBounds = Rect(left = 150, top = 50, right = 250, bottom = 150)
val statusBarStartSideBoundsCopy = Rect(statusBarStartSideBounds)
val statusBarEndSideBoundsCopy = Rect(statusBarEndSideBounds)
val letterBoxInnerBoundsCopy = Rect(letterBoxInnerBounds)
whenever(statusBarBoundsProvider.visibleStartSideBounds)
.thenReturn(statusBarStartSideBounds)
whenever(statusBarBoundsProvider.visibleEndSideBounds).thenReturn(statusBarEndSideBounds)
calculator.getLetterboxAppearance(
TEST_APPEARANCE,
TEST_APPEARANCE_REGIONS,
arrayOf(letterboxWithInnerBounds(letterBoxInnerBounds))
)
expect.that(statusBarStartSideBounds).isEqualTo(statusBarStartSideBoundsCopy)
expect.that(statusBarEndSideBounds).isEqualTo(statusBarEndSideBoundsCopy)
expect.that(letterBoxInnerBounds).isEqualTo(letterBoxInnerBoundsCopy)
}
@Test @Test
fun getLetterboxAppearance_noOverlap_BackgroundMultiColor_returnsAppearanceWithScrim() { fun getLetterboxAppearance_noOverlap_BackgroundMultiColor_returnsAppearanceWithScrim() {
whenever(letterboxBackgroundProvider.isLetterboxBackgroundMultiColored).thenReturn(true) whenever(letterboxBackgroundProvider.isLetterboxBackgroundMultiColored).thenReturn(true)