Merge "Fine tune camera cutout / display shape / round rect" into udc-qpr-dev am: 4b1b7e5209

Original change: https://googleplex-android-review.googlesource.com/c/device/google/akita/+/24016708

Change-Id: I2c1a1039cde7f6867fecf5e3e96cdf10a81d29b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

akita/overlay/frameworks/base/core/res/res/values/config.xml

@@ -247,8 +247,8 @@
 
     <!-- Display cutout configuration -->
     <string translatable="false" name="config_mainBuiltInDisplayCutout">
-        m 570.92,66.14
+        m 573.22,68.71
-        a 30.92,27.5 0 0 0 -61.83,0 30.92,27.5 0 0 0 61.83,0
+        a 33.72,33.72 0 0 0 -67.43,0 33.72,33.72 0 0 0 67.43,0
         z
         @left
     </string>
@@ -274,7 +274,7 @@
          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" translatable="false">m 5.21,147.1 c 0,-2.45 0,-4.9 0.02,-7.35 0.01,-2.45 0.03,-4.9 0.06,-7.35 0.03,-2.45 0.07,-4.9 0.15,-7.35 0.08,-2.45 0.2,-4.9 0.37,-7.34 0.68,-9.78 2.14,-19.55 4.91,-29.07 2.78,-9.52 6.87,-18.8 12.45,-27.41 5.58,-8.62 12.64,-16.57 20.93,-23.5 C 52.38,30.8 61.89,24.9 72.19,20.23 82.49,15.56 93.59,12.14 104.97,9.82 116.35,7.5 128.02,6.28 139.72,5.71 c 2.92,-0.14 5.85,-0.24 8.78,-0.31 2.93,-0.07 5.86,-0.1 8.79,-0.12 2.93,-0.02 5.86,-0.04 8.79,-0.05 2.93,-0.01 5.86,-0.01 8.79,-0.01 m 730.27,0 c 2.93,0 5.86,0 8.79,0.01 2.93,0.01 5.86,0.03 8.79,0.05 2.93,0.02 5.86,0.05 8.79,0.12 2.93,0.07 5.85,0.17 8.78,0.31 11.7,0.57 23.37,1.79 34.75,4.11 11.38,2.32 22.47,5.75 32.77,10.41 10.3,4.67 19.81,10.57 28.1,17.5 8.29,6.93 15.35,14.88 20.93,23.5 5.58,8.62 9.67,17.89 12.45,27.41 2.77,9.52 4.23,19.28 4.91,29.07 0.17,2.45 0.29,4.89 0.37,7.34 0.08,2.45 0.12,4.9 0.15,7.35 0.03,2.45 0.05,4.9 0.06,7.35 0.01,2.45 0.02,4.9 0.02,7.35 M 905.14,1993.05 H 174.86 M 1074.79,147.1 V 1851.17 z</string>
+    <string name="config_mainDisplayShape" translatable="false">M 96.5,0.09 C 91.13,0.36 82.7,1.63 79.38,2.34 59.53,6.58 50.35,10.97 39.94,18.2 27.73,26.69 16.6,39.86 10.5,52.79 6.41,61.47 2.37,75.03 1.22,83.76 0.14,91.99 0.31,92.14 0.09,96.34 V 2307.68 l 1.59,11.48 c 4.89,22.96 11.89,37.01 25.55,51.29 13.95,14.57 29.8,22.8 53.75,27.88 l 11.5,1.59 H 987.52 l 11.5,-1.59 c 23.95,-5.08 39.8,-13.31 53.75,-27.88 13.66,-14.27 20.66,-28.33 25.55,-51.29 l 1.59,-11.48 V 96.34 c -0.23,-4.2 -0.05,-4.34 -1.13,-12.57 -1.15,-8.73 -5.19,-22.3 -9.28,-30.98 C 1063.4,39.86 1052.27,26.69 1040.06,18.2 1029.65,10.97 1020.47,6.58 1000.62,2.34 997.3,1.63 988.87,0.36 983.5,0.09 Z</string>
 
     <!-- The max vibration strength allowed in audio haptic channels. -->
     <item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.32</item>

akita/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml

@@ -12,11 +12,11 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="180px"
+        android:width="171.7px"
-        android:height="162px"
+        android:height="171.7px"
-        android:viewportWidth="180"
+        android:viewportWidth="171.7"
-        android:viewportHeight="162">
+        android:viewportHeight="171.7">
     <path
         android:fillColor="#000000"
-        android:pathData="m 0,160.91 c 0,-2.83 0,-5.66 0.02,-8.5 0.01,-2.83 0.03,-5.66 0.06,-8.5 0.03,-2.83 0.07,-5.66 0.15,-8.49 0.08,-2.83 0.21,-5.66 0.39,-8.49 C 1.75,118.73 3.29,107.45 6.23,96.44 9.16,85.44 13.5,74.72 19.41,64.76 25.31,54.8 32.79,45.6 41.56,37.59 50.33,29.58 60.4,22.75 71.31,17.36 82.21,11.97 93.95,8.01 106,5.32 c 12.05,-2.68 24.41,-4.09 36.79,-4.75 3.1,-0.17 6.19,-0.28 9.29,-0.36 3.1,-0.08 6.2,-0.11 9.3,-0.14 3.1,-0.03 6.2,-0.05 9.3,-0.06 C 173.8,0 176.9,0 180,0 H 0 V 162 z"/>
+        android:pathData="m 0.23,171.5 c 0,-2.96 0,-5.91 0.02,-8.87 0.01,-2.96 0.03,-5.91 0.06,-8.87 0.03,-2.96 0.07,-5.91 0.15,-8.87 0.08,-2.96 0.2,-5.91 0.37,-8.86 0.69,-11.81 2.16,-23.6 4.96,-35.09 2.8,-11.49 6.94,-22.69 12.57,-33.09 5.63,-10.4 12.76,-20 21.12,-28.37 8.36,-8.37 17.96,-15.5 28.36,-21.13 10.4,-5.63 21.59,-9.77 33.08,-12.57 11.49,-2.8 23.27,-4.27 35.08,-4.96 2.95,-0.17 5.91,-0.3 8.86,-0.38 2.95,-0.08 5.91,-0.12 8.87,-0.15 2.96,-0.03 5.91,-0.05 8.87,-0.06 2.96,-0.01 5.91,-0.02 8.87,-0.02 H 0 V 171.7 z"/>
 </vector>

akita/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml

@@ -12,11 +12,11 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="180px"
+        android:width="171.7px"
-        android:height="162px"
+        android:height="171.7px"
-        android:viewportWidth="180"
+        android:viewportWidth="171.7"
-        android:viewportHeight="162">
+        android:viewportHeight="171.7">
     <path
         android:fillColor="#000000"
-        android:pathData="m 0,160.91 c 0,-2.83 0,-5.66 0.02,-8.5 0.01,-2.83 0.03,-5.66 0.06,-8.5 0.03,-2.83 0.07,-5.66 0.15,-8.49 0.08,-2.83 0.21,-5.66 0.39,-8.49 C 1.75,118.73 3.29,107.45 6.23,96.44 9.16,85.44 13.5,74.72 19.41,64.76 25.31,54.8 32.79,45.6 41.56,37.59 50.33,29.58 60.4,22.75 71.31,17.36 82.21,11.97 93.95,8.01 106,5.32 c 12.05,-2.68 24.41,-4.09 36.79,-4.75 3.1,-0.17 6.19,-0.28 9.29,-0.36 3.1,-0.08 6.2,-0.11 9.3,-0.14 3.1,-0.03 6.2,-0.05 9.3,-0.06 C 173.8,0 176.9,0 180,0 H 0 V 162 z"/>
+        android:pathData="m 0.23,171.5 c 0,-2.96 0,-5.91 0.02,-8.87 0.01,-2.96 0.03,-5.91 0.06,-8.87 0.03,-2.96 0.07,-5.91 0.15,-8.87 0.08,-2.96 0.2,-5.91 0.37,-8.86 0.69,-11.81 2.16,-23.6 4.96,-35.09 2.8,-11.49 6.94,-22.69 12.57,-33.09 5.63,-10.4 12.76,-20 21.12,-28.37 8.36,-8.37 17.96,-15.5 28.36,-21.13 10.4,-5.63 21.59,-9.77 33.08,-12.57 11.49,-2.8 23.27,-4.27 35.08,-4.96 2.95,-0.17 5.91,-0.3 8.86,-0.38 2.95,-0.08 5.91,-0.12 8.87,-0.15 2.96,-0.03 5.91,-0.05 8.87,-0.06 2.96,-0.01 5.91,-0.02 8.87,-0.02 H 0 V 171.7 z"/>
 </vector>