From 167d56261603c74a5f2a2691f1b6513a6c8bf36a Mon Sep 17 00:00:00 2001
From: Shawn Lin <shawnlin@google.com>
Date: Wed, 9 Nov 2022 04:21:27 +0000
Subject: [PATCH] Update rounded corner and cutout configs

Bug: 243693886
Test: make
Change-Id: I985aeb4124aa9039cc9249ed9add204744413d99
---
 .../base/core/res/res/values/config.xml       | 24 ++++++++++++
 .../base/core/res/res/values/dimens.xml       | 33 ++++++++++++++++
 .../res/drawable/rounded_corner_bottom.xml    | 22 +++++++++++
 .../res/drawable/rounded_corner_top.xml       | 22 +++++++++++
 .../packages/SystemUI/res/values/config.xml   | 39 +++++++++++++++++++
 5 files changed, 140 insertions(+)
 create mode 100644 shiba/overlay/frameworks/base/core/res/res/values/dimens.xml
 create mode 100644 shiba/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml
 create mode 100644 shiba/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml
 create mode 100644 shiba/overlay/frameworks/base/packages/SystemUI/res/values/config.xml

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 31e14a6..718db78 100644
--- a/shiba/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/shiba/overlay/frameworks/base/core/res/res/values/config.xml
@@ -220,4 +220,28 @@
         booted.  -->
     <integer name="config_stableDeviceDisplayWidth">1080</integer>
     <integer name="config_stableDeviceDisplayHeight">2400</integer>
+
+
+    <!-- Whether the display cutout region of the main built-in display should be forced to
+        black in software (to avoid aliasing or emulate a cutout that is not physically existent).
+    -->
+    <bool name="config_fillMainBuiltInDisplayCutout">true</bool>
+
+    <!-- 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
+        Z
+        @left
+    </string>
+
+    <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">
+        M 478.5,0
+        h 122
+        v 132
+        h -122
+        Z
+        @left
+    </string>
 </resources>
diff --git a/shiba/overlay/frameworks/base/core/res/res/values/dimens.xml b/shiba/overlay/frameworks/base/core/res/res/values/dimens.xml
new file mode 100644
index 0000000..d7ee9af
--- /dev/null
+++ b/shiba/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2022, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** 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.
+*/
+-->
+
+<resources>
+    <!-- Radius of the software rounded corners. -->
+    <dimen name="rounded_corner_radius">102px</dimen>
+    <dimen name="rounded_corner_radius_top">104px</dimen>
+    <dimen name="rounded_corner_radius_bottom">102px</dimen>
+
+    <!-- Height of the status bar.
+         Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
+         -->
+    <dimen name="status_bar_height_default">28dp</dimen>
+    <dimen name="status_bar_height_portrait">132px</dimen>
+    <dimen name="status_bar_height_landscape">28dp</dimen>
+
+</resources>
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
new file mode 100644
index 0000000..d01e81b
--- /dev/null
+++ b/shiba/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml
@@ -0,0 +1,22 @@
+<!--
+    Copyright (C) 2022 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="118px"
+    android:height="118px"
+    android:viewportWidth="11.8"
+    android:viewportHeight="11.8">
+    <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"/>
+</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
new file mode 100644
index 0000000..e7348fa
--- /dev/null
+++ b/shiba/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml
@@ -0,0 +1,22 @@
+<!--
+    Copyright (C) 2022 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="125px"
+    android:height="125px"
+    android:viewportWidth="12.5"
+    android:viewportHeight="12.5">
+    <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"/>
+</vector>
diff --git a/shiba/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/shiba/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
new file mode 100644
index 0000000..7e1881a
--- /dev/null
+++ b/shiba/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2022, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** 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.
+*/
+-->
+
+<!-- These resources are around just to allow their values to be customized
+     for different hardware and product builds. -->
+<resources>
+   <!-- Configure 13px of extra protection around the front-facing camera -->
+    <string translatable="false" name="config_frontBuiltInDisplayCutoutProtection">
+        M 489.5,66
+        a 50,50 0 0 1 100,0
+        a 50,50 0 0 1 -100,0
+        Z
+    </string>
+
+    <!-- Camera 0 is the front camera -->
+    <string translatable="false" name="config_protectedCameraId">0</string>
+
+    <!-- Comma-separated list of packages to exclude from camera protection. In our case,
+    ignore the gaze detection package -->
+    <string translatable="false" name="config_cameraProtectionExcludedPackages">com.google.android.as</string>
+
+    <bool name="config_enableDisplayCutoutProtection">true</bool>
+</resources>