From 4eadc8ff1741a2aefb2070a30abd973ed8ff7b2a Mon Sep 17 00:00:00 2001
From: Kimi Hsu <kimih@google.com>
Date: Fri, 15 Sep 2023 02:22:10 +0000
Subject: [PATCH] Update rounded corner, cutout and display shape configs

Bug: 286062699
Test: make
Change-Id: If1faa2415e6c3c77deb076784967b285fa923f7d
---
 .../base/core/res/res/values/config.xml       | 31 +++++++++++++++++++
 .../base/core/res/res/values/dimens.xml       | 25 +++++++++++++++
 .../res/drawable/rounded_corner_bottom.xml    | 22 +++++++++++++
 .../res/drawable/rounded_corner_top.xml       | 22 +++++++++++++
 4 files changed, 100 insertions(+)
 create mode 100644 caiman/overlay/frameworks/base/core/res/res/values/dimens.xml
 create mode 100644 caiman/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml
 create mode 100644 caiman/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml

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 40dd9d60..1abea1be 100644
--- a/caiman/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/caiman/overlay/frameworks/base/core/res/res/values/config.xml
@@ -233,4 +233,35 @@
 
     <!-- The max vibration strength allowed in audio haptic channels. -->
     <item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.335</item>
+
+    <dimen name="status_bar_height_default">52dp</dimen>
+    <dimen name="status_bar_height_portrait">52dp</dimen>
+    <dimen name="status_bar_height_landscape">52dp</dimen>
+
+    <!-- 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 687,101 a 46,46 0 0 0 -92,0 46,46 0 0 0 92,0 z
+        @left
+    </string>
+
+    <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">
+        m 586,43.5 h 115 v 115 H 586 Z
+        @left
+    </string>
+    <!-- A string config in svg path format for the main display shape.
+         (@see https://www.w3.org/TR/SVG/paths.html#PathData).
+
+         This config must be set unless:
+         1. {@link Configuration#isScreenRound} is true which means the display shape is circular
+            and the system will auto-generate a circular shape.
+         2. The display has no rounded corner and the system will auto-generate a rectangular shape.
+         (@see DisplayShape#createDefaultDisplayShape)
+
+         Note: If the display supports multiple resolutions, please define the path config based on
+         the highest resolution so that it can be scaled correctly in each resolution. -->
+    <string name="config_mainDisplayShape">M 1279.97,230.06 V 2624.26 M 0,229.82 V 2624.02 m 230.23,231.94 h 817.56 M 230.18,0.03 H 1047.83 M 1049.65,2855.93 c 40.06,-0.12 81.47,1.06 119.48,-13.6 43.5,-15.91 79.36,-51.02 96.08,-94.17 16.07,-39.24 14.57,-82.34 14.75,-123.9 m -0.07,-2394.27 c -0.12,-40 1.06,-81.34 -13.62,-119.3 C 1250.34,67.26 1215.17,31.46 1171.96,14.76 1132.65,-1.29 1089.49,0.21 1047.86,0.03 M 230.35,2855.72 c -40.06,-0.12 -81.47,1.06 -119.48,-13.6 -43.5,-15.91 -79.36,-51.03 -96.08,-94.17 -16.07,-39.24 -14.57,-82.34 -14.75,-123.9 m 0,-2394.06 C 0.15,189.99 -1.02,148.65 13.65,110.69 29.59,67.26 64.76,31.46 107.98,14.76 147.28,-1.29 190.44,0.21 232.07,0.03 z</string>
 </resources>
diff --git a/caiman/overlay/frameworks/base/core/res/res/values/dimens.xml b/caiman/overlay/frameworks/base/core/res/res/values/dimens.xml
new file mode 100644
index 00000000..9af98fed
--- /dev/null
+++ b/caiman/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -0,0 +1,25 @@
+<?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">115px</dimen>
+    <dimen name="rounded_corner_radius_top">118px</dimen>
+    <dimen name="rounded_corner_radius_bottom">115px</dimen>
+</resources>
diff --git a/caiman/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml b/caiman/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml
new file mode 100644
index 00000000..21d2dcfa
--- /dev/null
+++ b/caiman/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml
@@ -0,0 +1,22 @@
+<!--
+    Copyright (C) 2023 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="233px"
+        android:height="231px"
+        android:viewportWidth="233"
+        android:viewportHeight="231">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M 0.5,230.45 C 0.62,190.45 -0.56,149.11 14.12,111.16 30.06,67.73 65.23,31.92 108.44,15.22 147.74,-0.82 190.91,0.68 232.53,0.5 H 0.5 V 230.45 z"/>
+</vector>
diff --git a/caiman/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml b/caiman/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml
new file mode 100644
index 00000000..21d2dcfa
--- /dev/null
+++ b/caiman/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml
@@ -0,0 +1,22 @@
+<!--
+    Copyright (C) 2023 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="233px"
+        android:height="231px"
+        android:viewportWidth="233"
+        android:viewportHeight="231">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M 0.5,230.45 C 0.62,190.45 -0.56,149.11 14.12,111.16 30.06,67.73 65.23,31.92 108.44,15.22 147.74,-0.82 190.91,0.68 232.53,0.5 H 0.5 V 230.45 z"/>
+</vector>