From 9f9a33218cf505e627eeaa0eaa78176ad2cbc820 Mon Sep 17 00:00:00 2001
From: Evan Laird <evanlaird@google.com>
Date: Tue, 20 Sep 2022 19:51:11 +0000
Subject: [PATCH] Update device corners and holepunch

This CL updates the paths for the corners as
well as small adjustments to the front-facing holepunch camera.

Test: adb shell setprop debug.screenshot_rounded_corners 1 // then restart sysui
Bug: 238416581
Change-Id: Idfe83b9732b30a8fff92ed1eb5bc8959ab1526eb
---
 .../base/core/res/res/values/config.xml           |  2 +-
 .../res/drawable/rounded_corner_bottom.xml        | 12 +++++-------
 .../SystemUI/res/drawable/rounded_corner_top.xml  | 12 +++++-------
 .../res/drawable/rounded_corner_bottom.xml        | 15 ++++++---------
 .../SystemUI/res/drawable/rounded_corner_top.xml  | 15 ++++++---------
 5 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
index 8143486..8fb9fd2 100644
--- a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
@@ -51,7 +51,7 @@
 
     <!-- Display cutout configuration -->
     <string translatable="false" name="config_mainBuiltInDisplayCutout">
-        M 676,72
+        M 677,72
         a 43,43 0 1 0 86,0
         a 43,43 0 1 0 -86,0
         Z
diff --git a/cheetah/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml b/cheetah/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml
index 016390f..d561d3d 100644
--- a/cheetah/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml
+++ b/cheetah/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml
@@ -12,13 +12,11 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="176px"
-    android:height="176px"
-    android:viewportWidth="176"
-    android:viewportHeight="176">
-
+    android:width="121px"
+    android:height="121px"
+    android:viewportWidth="13.14"
+    android:viewportHeight="13.14">
     <path
         android:fillColor="#000000"
-        android:pathData="M 176,0 C 115.0238,1.1656496 102.53444,1.6177119 71.39639,3.3840542 55.923895,4.7275334 47.497614,6.018167 41.513855,7.981025 c -4.739091,1.5545684 -10.12658,4.010582 -14.72796,6.912399 -3.88932,2.452765 -6.723047,5.031081 -9.855743,8.228644 -3.872981,3.953175 -5.63514,7.245344 -7.8627801,11.693275 C 6.5442473,39.853268 4.8906853,45.485594 4.2629643,49.251025 2.1107263,62.161384 2.0435492,76.126365 1.3622065,93.833044 0.29590205,121.54408 0.79450819,135.72178 0,176 V 0 Z" />
+        android:pathData="M13.1,0c-0.94,0 -1.87,0 -2.81,0.01c-0.94,0.01 -1.87,0.04 -2.8,0.17c-1.89,0.26 -3.62,0.92 -5,2.31C1.1,3.87 0.43,5.6 0.17,7.49c-0.13,0.93 -0.16,1.86 -0.17,2.8C0,11.22 0,12.16 0,13.1c0,0.02 0,0.03 0,0.05C0,8.76 0,4.38 0,0c4.38,0 8.76,0 13.14,0C13.13,0 13.11,0 13.1,0z"/>
 </vector>
-
diff --git a/cheetah/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml b/cheetah/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml
index c1ab6e1..d561d3d 100644
--- a/cheetah/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml
+++ b/cheetah/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml
@@ -12,13 +12,11 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="176px"
-    android:height="176px"
-    android:viewportWidth="176"
-    android:viewportHeight="176">
-
+    android:width="121px"
+    android:height="121px"
+    android:viewportWidth="13.14"
+    android:viewportHeight="13.14">
     <path
         android:fillColor="#000000"
-        android:pathData="M 176,0 C 115.0238,1.1656496 102.53444,1.6177119 71.39639,3.3840542 55.658931,4.464517 48.371797,5.381139 40.939069,7.5951704 36.159077,9.0190158 30.970656,11.336916 26.369276,14.238733 22.479956,16.691498 19.646229,19.269814 16.513533,22.467377 12.640552,26.420552 10.129621,29.74615 8.1077333,34.291306 5.3988084,40.380905 4.5631294,44.598944 3.760158,49.204306 1.5210754,62.04634 2.0435492,76.126365 1.3622065,93.833044 0.29590205,121.54408 0.79450819,135.72178 0,176 V 0 Z" />
+        android:pathData="M13.1,0c-0.94,0 -1.87,0 -2.81,0.01c-0.94,0.01 -1.87,0.04 -2.8,0.17c-1.89,0.26 -3.62,0.92 -5,2.31C1.1,3.87 0.43,5.6 0.17,7.49c-0.13,0.93 -0.16,1.86 -0.17,2.8C0,11.22 0,12.16 0,13.1c0,0.02 0,0.03 0,0.05C0,8.76 0,4.38 0,0c4.38,0 8.76,0 13.14,0C13.13,0 13.11,0 13.1,0z"/>
 </vector>
-
diff --git a/panther/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml b/panther/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml
index d4bd012..0601a6d 100644
--- a/panther/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml
+++ b/panther/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml
@@ -12,14 +12,11 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="52px"
-        android:height="52px"
-        android:viewportWidth="52"
-        android:viewportHeight="52">
-
+        android:width="76px"
+        android:height="76px"
+        android:viewportWidth="13.14"
+        android:viewportHeight="13.1">
     <path
-        android:pathData="M 0,52 C 0.32683353,43.202367 0.85447252,41.248308 1.3145175,39.164085 2.0040968,36.039962 2.9782965,32.856298 4.930956,28.619162 6.8640705,24.746011 8.3187229,22.369478 11.084159,18.732191 13.224854,16.076923 15.477574,13.820493 18.237083,11.460208 21.535606,8.8787888 24.600798,6.8299358 27.856989,5.3126631 30.399944,4.1277339 32.60573,3.1207111 36.079556,2.1085717 38.994035,1.3856528 42.187628,0.21928042 52,0 H 0 Z"
-        android:fillColor="#000000" />
-
+        android:fillColor="#FF000000"
+        android:pathData="M13.1,0c-0.94,0 -1.87,0 -2.81,0.01c-0.94,0.01 -1.87,0.04 -2.8,0.17c-1.89,0.26 -3.62,0.92 -5,2.31C1.1,3.87 0.43,5.6 0.17,7.49c-0.13,0.93 -0.16,1.86 -0.17,2.8C0,11.22 0,12.16 0,13.1c0,0.02 0,0.03 0,0.05C0,8.76 0,4.38 0,0c4.38,0 8.76,0 13.14,0C13.13,0 13.11,0 13.1,0z"/>
 </vector>
-
diff --git a/panther/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml b/panther/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml
index f8f46dc..0601a6d 100644
--- a/panther/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml
+++ b/panther/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml
@@ -12,14 +12,11 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="52px"
-        android:height="52px"
-        android:viewportWidth="52"
-        android:viewportHeight="52">
-
+        android:width="76px"
+        android:height="76px"
+        android:viewportWidth="13.14"
+        android:viewportHeight="13.1">
     <path
-        android:pathData="M 0,52 C 0.36620502,42.772894 0.99266939,40.822359 1.441112,38.731412 1.9441013,36.386131 2.9782965,32.856298 4.930956,28.619162 6.8640705,24.746011 8.3187229,22.369478 11.084159,18.732191 13.224854,16.076923 15.477574,13.820493 18.237083,11.460208 21.535606,8.8787888 24.600798,6.8299358 27.856989,5.3126631 30.399944,4.1277339 32.68087,3.1650894 36.154696,2.15295 39.069175,1.430031 42.98474,0.36602086 52,0 H 0 Z"
-        android:fillColor="#000000" />
-
+        android:fillColor="#FF000000"
+        android:pathData="M13.1,0c-0.94,0 -1.87,0 -2.81,0.01c-0.94,0.01 -1.87,0.04 -2.8,0.17c-1.89,0.26 -3.62,0.92 -5,2.31C1.1,3.87 0.43,5.6 0.17,7.49c-0.13,0.93 -0.16,1.86 -0.17,2.8C0,11.22 0,12.16 0,13.1c0,0.02 0,0.03 0,0.05C0,8.76 0,4.38 0,0c4.38,0 8.76,0 13.14,0C13.13,0 13.11,0 13.1,0z"/>
 </vector>
-