From 9e8028074c36fbcfe92969f00e1f41bc8eb4fe6c Mon Sep 17 00:00:00 2001
From: Evan Laird <evanlaird@google.com>
Date: Wed, 17 Apr 2024 18:10:50 -0400
Subject: [PATCH] [Cutout] Make cutout rect approximation intersect with y=0

Tokay, Caiman, and Komodo all had cutout rect approximations that did
not intersect with the top edge of the phone (they did not start at
y=0). This was causing logic in SystemUI not to be aware of _which_ edge
the cutout was associated with, and thus in some cases would not account
for potential letterboxing.

This change modifies the rect approximations to start at y=0, and adds
that same amount to their height so that the sizing should be the same.

Test: manually verified the .svg shapes
Test: manual on device
Bug: 319203599
Flag: NONE
Change-Id: I2e669b8d178eb5ace29b0d4f68c1e500b545d601
(cherry picked from commit 4990157024eceb8766de2091e1ec1871275ecf0f)
---
 caiman/overlay/frameworks/base/core/res/res/values/config.xml | 2 +-
 komodo/overlay/frameworks/base/core/res/res/values/config.xml | 2 +-
 tokay/overlay/frameworks/base/core/res/res/values/config.xml  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/caiman/overlay/frameworks/base/core/res/res/values/config.xml b/caiman/overlay/frameworks/base/core/res/res/values/config.xml
index 224c4a36..8691001a 100644
--- a/caiman/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/caiman/overlay/frameworks/base/core/res/res/values/config.xml
@@ -179,7 +179,7 @@
     </string>
 
     <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">
-        m 586,43.5 h 115 v 115 H 586 Z
+        m 586,0 h 108.5 v 155.5 H 586 Z
         @left
     </string>
     <!-- A string config in svg path format for the main display shape.
diff --git a/komodo/overlay/frameworks/base/core/res/res/values/config.xml b/komodo/overlay/frameworks/base/core/res/res/values/config.xml
index b565a6f7..edcee7a4 100644
--- a/komodo/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/komodo/overlay/frameworks/base/core/res/res/values/config.xml
@@ -179,7 +179,7 @@
     </string>
 
     <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">
-        m 614.53715,43.5 h 115 v 115 h -115 z
+        m 614.53715,0 h 115 v 158.5 h -115 z
         @left
     </string>
     <!-- A string config in svg path format for the main display shape.
diff --git a/tokay/overlay/frameworks/base/core/res/res/values/config.xml b/tokay/overlay/frameworks/base/core/res/res/values/config.xml
index b3c4a530..ab6418a0 100644
--- a/tokay/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/tokay/overlay/frameworks/base/core/res/res/values/config.xml
@@ -179,7 +179,7 @@
     </string>
 
     <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">
-        m 484.5,20.5 h 110 v 121 h -110 z
+        m 484.5,0 h 110 v 141.5 h -110 z
         @left
     </string>
     <!-- A string config in svg path format for the main display shape.