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

Bug: 286064534
Test: make
Change-Id: I9f5ab37ed9b849fd8b340ca72623795b8dd32f04
---
 .../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 tokay/overlay/frameworks/base/core/res/res/values/dimens.xml
 create mode 100644 tokay/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml
 create mode 100644 tokay/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml

diff --git a/tokay/overlay/frameworks/base/core/res/res/values/config.xml b/tokay/overlay/frameworks/base/core/res/res/values/config.xml
index 40dd9d60..9dff6a4e 100644
--- a/tokay/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/tokay/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 581,86 a 41.5,41.5 0 0 0 -83,0 41.5,41.5 0 0 0 83,0 z
+        @left
+    </string>
+
+    <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">
+        m 485.5,0 h 110 v 121 h -110 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 1079.21,2228.08 c 3.13,58.5 -3.65,126.64 -54.98,164.03 -39.44,31.96 -91.95,31.83 -140.01,31.12 M 0.78,195.92 C -2.33,137.43 4.43,69.29 55.77,31.9 95.19,-0.06 147.73,0.05 195.78,0.78 m 0,2422.45 C 137.32,2426.31 69.25,2419.57 31.88,2368.2 -0.05,2328.72 0.04,2276.18 0.78,2228.08 M 884.22,0.78 C 942.67,-2.32 1010.77,4.42 1048.12,55.81 c 31.95,39.46 31.84,92.02 31.09,140.12 M 0.78,2228.08 V 195.92 m 1078.43,0 V 2228.08 M 195.78,0.78 h 688.45 m 0,2422.45 H 195.78 z</string>
 </resources>
diff --git a/tokay/overlay/frameworks/base/core/res/res/values/dimens.xml b/tokay/overlay/frameworks/base/core/res/res/values/dimens.xml
new file mode 100644
index 00000000..9af98fed
--- /dev/null
+++ b/tokay/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/tokay/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml b/tokay/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml
new file mode 100644
index 00000000..b81ccbd3
--- /dev/null
+++ b/tokay/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="196px"
+        android:height="196px"
+        android:viewportWidth="33.4"
+        android:viewportHeight="33.4">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M 0.13,33.43 C -0.4,23.45 0.76,11.82 9.52,5.44 16.26,-0.01 25.23,0.01 33.43,0.13 H 0.13 V 33.4 z"/>
+</vector>
diff --git a/tokay/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml b/tokay/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml
new file mode 100644
index 00000000..b81ccbd3
--- /dev/null
+++ b/tokay/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="196px"
+        android:height="196px"
+        android:viewportWidth="33.4"
+        android:viewportHeight="33.4">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M 0.13,33.43 C -0.4,23.45 0.76,11.82 9.52,5.44 16.26,-0.01 25.23,0.01 33.43,0.13 H 0.13 V 33.4 z"/>
+</vector>