From ccd6d2ba9f08584c44faa2577f49f648029013e9 Mon Sep 17 00:00:00 2001
From: Bill Lin <lbill@google.com>
Date: Tue, 11 May 2021 19:20:51 +0800
Subject: [PATCH] Adjust R4 rounded corner & punch hole anti-aliasing

1) Adjust the position of punch hole to match the H/W display

2) Previously, there wasn't rounded corner drawable for raven,
   R4 adapted with gs101 customization by default.

Test: make and flash ROM
Test: Observe rounded corner and punch hole
Bug: 179171408
Change-Id: Ib68797c870fb5ee1208c844a9863090856ad8ee7
---
 .../base/core/res/res/values/config.xml       | 14 ++++++-----
 .../res/drawable/rounded_corner_bottom.xml    | 24 +++++++++++++++++++
 .../res/drawable/rounded_corner_top.xml       | 24 +++++++++++++++++++
 .../packages/SystemUI/res/values/config.xml   | 14 +++++++++++
 4 files changed, 70 insertions(+), 6 deletions(-)
 create mode 100644 raven/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml
 create mode 100644 raven/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml

diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml
index 91fed9e..836fb1c 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -33,21 +33,23 @@
 
     <!-- Display cutout configuration -->
     <string translatable="false" name="config_mainBuiltInDisplayCutout">
-        M 680,71
-        a 42,42 0 1 0 84,0 42,42 0 1 0 -84,0
+        M 677,72
+        a 42,42 0 1 0 84,0 
+        a 42,42 0 1 0 -84,0
         Z
         @left
     </string>
 
     <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">
-        M 664,13
-        h 116
-        v 116
-        h -116
+        M 655,0
+        h 126
+        v 130
+        h -126
         Z
         @left
     </string>
 
+
     <!-- Radius of the software rounded corners. -->
     <dimen name="rounded_corner_radius">25px</dimen>
 
diff --git a/raven/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml b/raven/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml
new file mode 100644
index 0000000..016390f
--- /dev/null
+++ b/raven/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml
@@ -0,0 +1,24 @@
+<!--
+    Copyright (C) 2021 The Android Open Source Project
+
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    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">
+
+    <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" />
+</vector>
+
diff --git a/raven/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml b/raven/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml
new file mode 100644
index 0000000..c1ab6e1
--- /dev/null
+++ b/raven/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml
@@ -0,0 +1,24 @@
+<!--
+    Copyright (C) 2021 The Android Open Source Project
+
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    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">
+
+    <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" />
+</vector>
+
diff --git a/raven/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/raven/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index 8f9f879..a213966 100644
--- a/raven/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/raven/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -52,5 +52,19 @@
         <item>0</item> <!-- 3: HIGH -->
         <item>0</item> <!-- 4: SUN -->
     </integer-array>
+
+    <bool name="config_roundedCornerMultipleRadius">true</bool>
+
+    <!-- Configure 13px of extra protection around the front-facing camera -->
+    <string translatable="false" name="config_frontBuiltInDisplayCutoutProtection">
+        M 661,72
+        a 57,57 0 1 0 114,0
+        a 57,57 0 1 0 -114,0
+        Z
+    </string>
+
+    <!-- Camera 1 is the front camera on barbet -->
+    <string translatable="false" name="config_protectedCameraId">1</string>
+
 </resources>