From 15322da9dc68fe569ceed93a4fc6268bbd72dd5a Mon Sep 17 00:00:00 2001 From: Felka Chang Date: Sat, 15 Feb 2020 12:03:00 +0800 Subject: [PATCH] Fix CutoutSpecification logic bug if the specification contains all of left, top, right, and bottom bind cutout, the bottom cutout rect return null. But, it should be non-null. The specification that contains bottom right corner cutout assigned to long edge in phone like device can't be achieved. But, it should be achieved. Test: atest \ FrameworksCoreTests:android.view.DisplayCutoutTest \ FrameworksCoreTests:android.view.CutoutSpecificationTest \ SystemUITests:com.android.systemui.ScreenDecorationsTest \ CorePerfTests:android.view.CutoutSpecificationBenchmark Fixes: 149675352 Change-Id: I6c742f93e72627f1d58b8ce971a4b1cc9792d5cf --- .../android/view/CutoutSpecification.java | 22 ++-- .../android/view/CutoutSpecificationTest.java | 106 +++++++++++++++++- 2 files changed, 110 insertions(+), 18 deletions(-) diff --git a/core/java/android/view/CutoutSpecification.java b/core/java/android/view/CutoutSpecification.java index d21a9520e12cc..850e9fc0db7eb 100644 --- a/core/java/android/view/CutoutSpecification.java +++ b/core/java/android/view/CutoutSpecification.java @@ -406,9 +406,7 @@ public class CutoutSpecification { } currentIndex += RIGHT_MARKER.length(); } else if (specWithoutDp.startsWith(BOTTOM_MARKER, currentIndex)) { - if (!mPositionFromCenterVertical) { - parseSvgPathSpec(region, sb.toString()); - } + parseSvgPathSpec(region, sb.toString()); currentIndex += BOTTOM_MARKER.length(); /* prepare to parse the rest path */ @@ -416,9 +414,7 @@ public class CutoutSpecification { mBindBottomCutout = true; mPositionFromBottom = true; } else if (specWithoutDp.startsWith(CENTER_VERTICAL_MARKER, currentIndex)) { - if (!mPositionFromBottom) { - parseSvgPathSpec(region, sb.toString()); - } + parseSvgPathSpec(region, sb.toString()); currentIndex += CENTER_VERTICAL_MARKER.length(); /* prepare to parse the rest path */ @@ -431,14 +427,16 @@ public class CutoutSpecification { /* prepare to parse the rest path */ resetStatus(sb); } else if (specWithoutDp.startsWith(BIND_LEFT_CUTOUT_MARKER, currentIndex)) { - if (!mBindBottomCutout && !mBindRightCutout) { - mBindLeftCutout = true; - } + mBindBottomCutout = false; + mBindRightCutout = false; + mBindLeftCutout = true; + currentIndex += BIND_LEFT_CUTOUT_MARKER.length(); } else if (specWithoutDp.startsWith(BIND_RIGHT_CUTOUT_MARKER, currentIndex)) { - if (!mBindBottomCutout && !mBindLeftCutout) { - mBindRightCutout = true; - } + mBindBottomCutout = false; + mBindLeftCutout = false; + mBindRightCutout = true; + currentIndex += BIND_RIGHT_CUTOUT_MARKER.length(); } else { currentIndex += 1; diff --git a/core/tests/coretests/src/android/view/CutoutSpecificationTest.java b/core/tests/coretests/src/android/view/CutoutSpecificationTest.java index 1f831bb2f9a8e..b41f90c4689ed 100644 --- a/core/tests/coretests/src/android/view/CutoutSpecificationTest.java +++ b/core/tests/coretests/src/android/view/CutoutSpecificationTest.java @@ -69,6 +69,13 @@ public class CutoutSpecificationTest { + "z\n" + "@right\n" + "@bind_right_cutout\n" + + "@bottom\n" + + "M 0,0\n" + + "h -24\n" + + "v -48\n" + + "h 48\n" + + "v 48\n" + + "z\n" + "@dp"; private static final String CORNER_CUTOUT_SPECIFICATION = "M 0,0\n" + "h 1\n" @@ -140,6 +147,12 @@ public class CutoutSpecificationTest { assertThat(cutoutSpecification.getLeftBound()).isEqualTo(new Rect(0, 960, 168, 1128)); } + @Test + public void parse_withBindMarker_shouldHaveTopBound() { + CutoutSpecification cutoutSpecification = mParser.parse(WITH_BIND_CUTOUT_SPECIFICATION); + assertThat(cutoutSpecification.getTopBound()).isEqualTo(new Rect(0, 0, 168, 168)); + } + @Test public void parse_withBindMarker_shouldHaveRightBound() { CutoutSpecification cutoutSpecification = mParser.parse(WITH_BIND_CUTOUT_SPECIFICATION); @@ -147,7 +160,54 @@ public class CutoutSpecificationTest { } @Test - public void parse_tallCutout_shouldBeDone() { + public void parse_withBindMarker_shouldHaveBottomBound() { + CutoutSpecification cutoutSpecification = mParser.parse(WITH_BIND_CUTOUT_SPECIFICATION); + assertThat(cutoutSpecification.getBottomBound()).isEqualTo(new Rect(456, 1752, 624, 1920)); + } + + @Test + public void parse_withBindMarker_shouldMatchExpectedSafeInset() { + CutoutSpecification cutoutSpecification = mParser.parse(WITH_BIND_CUTOUT_SPECIFICATION); + assertThat(cutoutSpecification.getSafeInset()).isEqualTo(new Rect(168, 168, 168, 168)); + } + + @Test + public void parse_withBindMarker_tabletLikeDevice_shouldHaveLeftBound() { + CutoutSpecification cutoutSpecification = new CutoutSpecification.Parser(3.5f, 1920, 1080) + .parse(WITH_BIND_CUTOUT_SPECIFICATION); + assertThat(cutoutSpecification.getLeftBound()).isEqualTo(new Rect(0, 540, 168, 708)); + } + + @Test + public void parse_withBindMarker_tabletLikeDevice_shouldHaveTopBound() { + CutoutSpecification cutoutSpecification = new CutoutSpecification.Parser(3.5f, 1920, 1080) + .parse(WITH_BIND_CUTOUT_SPECIFICATION); + assertThat(cutoutSpecification.getTopBound()).isEqualTo(new Rect(0, 0, 168, 168)); + } + + @Test + public void parse_withBindMarker_tabletLikeDevice_shouldHaveRightBound() { + CutoutSpecification cutoutSpecification = new CutoutSpecification.Parser(3.5f, 1920, 1080) + .parse(WITH_BIND_CUTOUT_SPECIFICATION); + assertThat(cutoutSpecification.getRightBound()).isEqualTo(new Rect(1752, 540, 1920, 708)); + } + + @Test + public void parse_withBindMarker_tabletLikeDevice_shouldHaveBottomBound() { + CutoutSpecification cutoutSpecification = new CutoutSpecification.Parser(3.5f, 1920, 1080) + .parse(WITH_BIND_CUTOUT_SPECIFICATION); + assertThat(cutoutSpecification.getBottomBound()).isEqualTo(new Rect(876, 912, 1044, 1080)); + } + + @Test + public void parse_withBindMarker_tabletLikeDevice_shouldMatchExpectedSafeInset() { + CutoutSpecification cutoutSpecification = new CutoutSpecification.Parser(3.5f, 1920, 1080) + .parse(WITH_BIND_CUTOUT_SPECIFICATION); + assertThat(cutoutSpecification.getSafeInset()).isEqualTo(new Rect(168, 0, 168, 168)); + } + + @Test + public void parse_tallCutout_topBoundShouldMatchExpectedHeight() { CutoutSpecification cutoutSpecification = mParser.parse("M 0,0\n" + "L -48, 0\n" + "L -44.3940446283, 36.0595537175\n" @@ -162,7 +222,7 @@ public class CutoutSpecificationTest { } @Test - public void parse_wideCutout_shouldBeDone() { + public void parse_wideCutout_topBoundShouldMatchExpectedWidth() { CutoutSpecification cutoutSpecification = mParser.parse("M 0,0\n" + "L -72, 0\n" + "L -69.9940446283, 20.0595537175\n" @@ -177,7 +237,7 @@ public class CutoutSpecificationTest { } @Test - public void parse_narrowCutout_shouldBeDone() { + public void parse_narrowCutout_topBoundShouldHaveExpectedWidth() { CutoutSpecification cutoutSpecification = mParser.parse("M 0,0\n" + "L -24, 0\n" + "L -21.9940446283, 20.0595537175\n" @@ -192,7 +252,7 @@ public class CutoutSpecificationTest { } @Test - public void parse_doubleCutout_shouldBeDone() { + public void parse_doubleCutout_topBoundShouldHaveExpectedHeight() { CutoutSpecification cutoutSpecification = mParser.parse("M 0,0\n" + "L -72, 0\n" + "L -69.9940446283, 20.0595537175\n" @@ -217,7 +277,7 @@ public class CutoutSpecificationTest { } @Test - public void parse_cornerCutout_shouldBeDone() { + public void parse_cornerCutout_topBoundShouldHaveExpectedHeight() { CutoutSpecification cutoutSpecification = mParser.parse("M 0,0\n" + "L -48, 0\n" + "C -48,48 -48,48 0,48\n" @@ -229,7 +289,7 @@ public class CutoutSpecificationTest { } @Test - public void parse_holeCutout_shouldBeDone() { + public void parse_holeCutout_shouldMatchExpectedInset() { CutoutSpecification cutoutSpecification = mParser.parse("M 20.0,20.0\n" + "h 136\n" + "v 136\n" @@ -259,4 +319,38 @@ public class CutoutSpecificationTest { assertThat(cutoutSpecification.getSafeInset()) .isEqualTo(new Rect(6, 0, 8, 0)); } + + @Test + public void parse_bottomLeftSpec_withBindLeftMarker_shouldBeLeftBound() { + CutoutSpecification cutoutSpecification = + new CutoutSpecification.Parser(2f, 400, 200) + .parse("@bottom" + + "M 0,0\n" + + "v -10\n" + + "h 10\n" + + "v 10\n" + + "z\n" + + "@left\n" + + "@bind_left_cutout"); + + assertThat(cutoutSpecification.getLeftBound()) + .isEqualTo(new Rect(0, 190, 10, 200)); + } + + @Test + public void parse_bottomRightSpec_withBindRightMarker_shouldBeRightBound() { + CutoutSpecification cutoutSpecification = + new CutoutSpecification.Parser(2f, 400, 200) + .parse("@bottom" + + "M 0,0\n" + + "v -10\n" + + "h 10\n" + + "v 10\n" + + "z\n" + + "@right\n" + + "@bind_right_cutout"); + + assertThat(cutoutSpecification.getRightBound()) + .isEqualTo(new Rect(390, 190, 400, 200)); + } }