From f90fd259f38969cd77f1149425dd85aea8e6cc26 Mon Sep 17 00:00:00 2001
From: Evan Laird <evanlaird@google.com>
Date: Fri, 2 Jun 2023 20:11:06 +0000
Subject: [PATCH] Revert "Revert "New corner specs for husky/shiba""

This reverts commit aa6ffea6c55b3aee411f541df4f266796ae37591.

Reason for revert: Fixing the issue that caused the revert

Added new assets (same for top/botom) for husky and shiba, as well as
tuned the holepunch cutout antialiasing curves based on the following
specs:

Husky:
- corner size 146.5px
- holepunch center coords: (672px, 75px)
- holepunch radius: 43.25px

Shiba:
- corner size 128px
- holepunch center coords: (540px, 68.5px)
- holepunch radius: 36.5px

Test: needs manual validation
Bug: 243693886

Change-Id: I0b951f6a06a5421fdd22a7d67290468946e3c50b
---
 .../base/core/res/res/values/config.xml           |  6 +++---
 .../res/drawable/rounded_corner_bottom.xml        | 12 ++++++------
 .../SystemUI/res/drawable/rounded_corner_top.xml  | 12 ++++++------
 .../base/core/res/res/values/config.xml           |  6 +++---
 .../res/drawable/rounded_corner_bottom.xml        | 15 ++++++++-------
 .../SystemUI/res/drawable/rounded_corner_top.xml  | 15 ++++++++-------
 6 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/husky/overlay/frameworks/base/core/res/res/values/config.xml b/husky/overlay/frameworks/base/core/res/res/values/config.xml
index 6a633fb..1fff984 100644
--- a/husky/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/husky/overlay/frameworks/base/core/res/res/values/config.xml
@@ -248,9 +248,9 @@
 
     <!-- Display cutout configuration -->
     <string translatable="false" name="config_mainBuiltInDisplayCutout">
-        M 626.5,75.5
-        a 45,45 0 1 0 90,0
-        a 45,45 0 1 0 -90,0
+        M 628.75,75
+        a 43.25,43.25 0 1 0 86.5,0
+        a 43.25,43.25 0 1 0 -86.5,0
         Z
         @left
     </string>
diff --git a/husky/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml b/husky/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml
index 1e72479..379aa25 100644
--- a/husky/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml
+++ b/husky/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml
@@ -1,5 +1,5 @@
 <!--
-    Copyright (C) 2021 The Android Open Source Project
+    Copyright (C) 2023 The Android Open Source Project
 
     You may obtain a copy of the License at
 
@@ -12,11 +12,11 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="115px"
-    android:height="115px"
-    android:viewportWidth="115"
-    android:viewportHeight="115">
+        android:width="146.5px"
+        android:height="146.5px"
+        android:viewportWidth="21.56"
+        android:viewportHeight="21.56">
     <path
         android:fillColor="#000000"
-        android:pathData="m 100.6831,1.9816622 c -29.806898,6.3378 -49.540698,16.5907998 -66.898198,34.7579998 -17.004,17.7973 -25.7170003,35.315 -31.8043003,63.943898 L -9.8267718e-5,114.99996 V -3.7795276e-5 H 114.9999 L 100.6834,1.9814622 Z"/>
+        android:pathData="m0,21.56C0,18.524 -0.037,15.685 0.701,12.679c0.717,-2.922 2.089,-5.584 4.241,-7.736C7.093,2.791 9.755,1.419 12.678,0.701 15.684,-0.037 18.524,0 21.56,0H0v21.559Z"/>
 </vector>
diff --git a/husky/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml b/husky/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml
index 80880bf..379aa25 100644
--- a/husky/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml
+++ b/husky/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml
@@ -1,5 +1,5 @@
 <!--
-    Copyright (C) 2022 The Android Open Source Project
+    Copyright (C) 2023 The Android Open Source Project
 
     You may obtain a copy of the License at
 
@@ -12,11 +12,11 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="120px"
-    android:height="120px"
-    android:viewportWidth="12"
-    android:viewportHeight="12">
+        android:width="146.5px"
+        android:height="146.5px"
+        android:viewportWidth="21.56"
+        android:viewportHeight="21.56">
     <path
         android:fillColor="#000000"
-        android:pathData="M 0.1412,10.432865 C 0.28411,9.343999 0.78655,7.653078 1.29623,6.570671 2.05506,4.959135 3.44108,3.316382 4.96049,2.258588 6.2561,1.356598 7.39814,0.809879 9.86951,0.280664 10.2831,0.192 11.33241,0.03432 12,0 H 0 V 11.999999 C 0.02856,11.4764 0.0066,11.458694 0.1412,10.432865 Z"/>
+        android:pathData="m0,21.56C0,18.524 -0.037,15.685 0.701,12.679c0.717,-2.922 2.089,-5.584 4.241,-7.736C7.093,2.791 9.755,1.419 12.678,0.701 15.684,-0.037 18.524,0 21.56,0H0v21.559Z"/>
 </vector>
diff --git a/shiba/overlay/frameworks/base/core/res/res/values/config.xml b/shiba/overlay/frameworks/base/core/res/res/values/config.xml
index 5daf6f5..94ff4b3 100644
--- a/shiba/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/shiba/overlay/frameworks/base/core/res/res/values/config.xml
@@ -274,9 +274,9 @@
 
     <!-- Display cutout configuration -->
     <string translatable="false" name="config_mainBuiltInDisplayCutout">
-        M 502.5,66
-        a 37,37 0 0 1 74,0
-        a 37,37 0 0 1 -74,0
+        M 503.5,68.5
+        a 36.5,36.5 0 0 1 73,0
+        a 36.5,36.5 0 0 1 -73,0
         Z
         @left
     </string>
diff --git a/shiba/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml b/shiba/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml
index d01e81b..229e6ed 100644
--- a/shiba/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml
+++ b/shiba/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml
@@ -1,5 +1,5 @@
 <!--
-    Copyright (C) 2022 The Android Open Source Project
+    Copyright (C) 2023 The Android Open Source Project
 
     You may obtain a copy of the License at
 
@@ -12,11 +12,12 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="118px"
-    android:height="118px"
-    android:viewportWidth="11.8"
-    android:viewportHeight="11.8">
+        android:width="128px"
+        android:height="128px"
+        android:viewportWidth="21.596"
+        android:viewportHeight="21.596">
     <path
-        android:fillColor="#000000"
-        android:pathData="M -9.8501356e-5,11.799901 -2.0113562e-6,-9.8501354e-5 H 11.799903 L 11.543039,0.0056015 l -0.290295,0.0044 -0.295807,0.0068 -0.301511,0.01007 -0.307222,0.01427 -0.312535,0.01908 -0.3180465,0.02532 -0.322573,0.03153 -0.327098,0.03876 -0.331036,0.04701 -0.334183,0.05605 -0.336743,0.06549 -0.33871,0.07592 -0.339694,0.08698 -0.340089,0.09823 -0.339694,0.11028 -0.338317,0.12275 -0.336152,0.13519 -0.332806,0.14825 -0.329067,0.1615 -0.324146,0.17437 -0.318242,0.18783 -0.311945,0.20087 -0.304465,0.21374 -0.296397,0.22639 -0.287539,0.23905 -0.277896,0.2507 -0.267662,0.26254 -0.257035,0.2734 -0.245619,0.28385 -0.234007,0.29349 -0.221805,0.30272 -0.20921,0.31096 -0.196614,0.31839 -0.184017,0.32502 -0.170831,0.33107 -0.158039,0.33586 -0.14524601,0.34008 -0.13245299,0.34312 -0.120055,0.34551 -0.108048,0.34671 -0.09624,0.34754 -0.08502,0.3469 -0.07439,0.34593 -0.06436,0.3439 -0.05471,0.34129 -0.04605,0.33789 -0.03798,0.33406 -0.0309,0.32944 -0.0246,0.3246195 -0.01889,0.31921 -0.01397,0.31378 -0.0098,0.30793 -0.01331,0.30212 z"/>
+        android:fillColor="#FF000000"
+        android:pathData="m0,21.596C0,18.555 -0.037,15.711 0.702,12.7c0.718,-2.927 2.092,-5.593 4.247,-7.749C7.105,2.796 9.772,1.421 12.699,0.703 15.711,-0.037 18.555,0 21.596,0H0v21.595Z"/>
 </vector>
+
diff --git a/shiba/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml b/shiba/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml
index e7348fa..229e6ed 100644
--- a/shiba/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml
+++ b/shiba/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml
@@ -1,5 +1,5 @@
 <!--
-    Copyright (C) 2022 The Android Open Source Project
+    Copyright (C) 2023 The Android Open Source Project
 
     You may obtain a copy of the License at
 
@@ -12,11 +12,12 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="125px"
-    android:height="125px"
-    android:viewportWidth="12.5"
-    android:viewportHeight="12.5">
+        android:width="128px"
+        android:height="128px"
+        android:viewportWidth="21.596"
+        android:viewportHeight="21.596">
     <path
-        android:fillColor="#000000"
-        android:pathData="M 5.2217713e-6,4.8730029e-6 0,12.5 l 0.00431042,-0.351921 0.0069,-0.320231 0.01022,-0.326406 0.0145,-0.332578 0.01961,-0.338329 0.02553,-0.344077 0.03207,-0.34919 0.03942,-0.3540841 0.0478,-0.35813 0.05678,-0.361751 0.06679,-0.364518 0.07721,-0.366646 0.08824,-0.367711 0.09988,-0.36835 0.112134,-0.367499 0.124595,-0.366222 0.137461,-0.363666 0.15073998,-0.360473 0.164015,-0.356 0.177291,-0.350678 0.190976,-0.344717 0.204049,-0.337477 0.217121,-0.329599 0.230193,-0.320869 0.242856,-0.311075 0.254908,-0.300855 0.266755,-0.289783 0.277784,-0.278073 0.288405,-0.265937 0.298413,-0.253374 0.307606,-0.239959 0.315978,-0.226546 0.323742,-0.212919 0.330277,-0.198867 0.336404,-0.185026 0.341511,-0.171187 0.345392,-0.157135 0.348863,-0.14329403 0.351112,-0.130094 0.352541,-0.116893 0.352949,-0.104118 0.35254,-0.09219 0.351519,-0.08048 0.349477,-0.06941 0.346821,-0.0594 0.343554,-0.04982 0.339469,-0.04109 0.3347686,-0.03343 0.330074,-0.0264 0.324353,-0.02023 0.318838,-0.01533 0.312917,-0.01065 0.306989,-0.0075 0.301275,-0.0043 L 12.241276,9.12873e-4 12.5,0 Z"/>
+        android:fillColor="#FF000000"
+        android:pathData="m0,21.596C0,18.555 -0.037,15.711 0.702,12.7c0.718,-2.927 2.092,-5.593 4.247,-7.749C7.105,2.796 9.772,1.421 12.699,0.703 15.711,-0.037 18.555,0 21.596,0H0v21.595Z"/>
 </vector>
+