Merge "Update the svg path of round corner to lower precision" into udc-qpr-dev

2023-07-11 02:52:02 +00:00 · 2023-07-11 02:52:02 +00:00 · 7d0cb7e42a
commit 7d0cb7e42a
parent dd450afe80 842fd00fa1
4 changed files with 6 additions and 6 deletions
--- a/akita/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/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.91681,66.138527
-        a 30.915905,27.49891 0 0 0 -61.83181,0 30.915905,27.49891 0 0 0 61.83181,0
+        m 570.92,66.14
+        a 30.92,27.5 0 0 0 -61.83,0 30.92,27.5 0 0 0 61.83,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.213797,147.09809 c 0,-2.44991 0.00407,-4.89978 0.016316,-7.34964 0.012237,-2.44987 0.032676,-4.89966 0.061384,-7.34946 0.028731,-2.44983 0.065712,-4.89966 0.1450247,-7.34819 0.079314,-2.44853 0.2009419,-4.89577 0.3710122,-7.34174 0.6802903,-9.78379 2.1356668,-19.546952 4.9111981,-29.066538 2.775531,-9.519623 6.871213,-18.795665 12.45007,-27.410748 5.578852,-8.615083 12.640875,-16.56921 20.92714,-23.499505 C 52.382206,30.802011 61.892708,24.895542 72.193606,20.229526 82.494507,15.563583 93.5858,12.138093 104.96833,9.8175248 116.35086,7.4969572 128.02462,6.281312 139.72281,5.7109779 c 2.92454,-0.1427594 5.85062,-0.2447294 8.77828,-0.3114768 2.92766,-0.066372 5.85689,-0.09715 8.78611,-0.1212535 2.92921,-0.02226 5.8584,-0.041161 8.78764,-0.051169 2.92925,-0.011112 5.85855,-0.014828 8.78784,-0.014828 m 730.27444,0.00148 c 2.92927,0 5.85858,0.00341 8.78781,0.014828 2.92926,0.011112 5.85845,0.025939 8.78767,0.051173 2.92918,0.02226 5.85844,0.054878 8.78611,0.1212535 2.92768,0.066376 5.85379,0.1679741 8.77837,0.3103618 11.69832,0.5689253 23.37198,1.7861276 34.75444,4.107437 11.38242,2.3212725 22.47368,5.7466525 32.77458,10.4124825 10.301,4.665831 19.8116,10.572077 28.098,17.502223 8.2864,6.93015 15.3487,14.884162 20.9278,23.499245 5.579,8.615045 9.6748,17.891163 12.4494,27.410859 2.7747,9.519661 4.2282,19.282898 4.9101,29.066608 0.1703,2.4459 0.2927,4.8931 0.3724,7.34164 0.08,2.44849 0.1162,4.89836 0.145,7.34819 0.027,2.44979 0.049,4.89958 0.061,7.34945 0.013,2.44983 0.018,4.89973 0.018,7.34964 M 905.13668,1993.053 H 174.86141 M 1074.7859,147.09627 V 1851.1685 z</string>
+    <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>

    <!-- The max vibration strength allowed in audio haptic channels. -->
    <item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.32</item>
--- a/akita/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml
+++ b/akita/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml
@ -18,5 +18,5 @@
        android:viewportHeight="162">
    <path
        android:fillColor="#000000"
-        android:pathData="m 0,160.91275 c 0,-2.83202 0.00434187,-5.664 0.01727217,-8.49597 0.01295148,-2.83199 0.03459728,-5.66388 0.06499037,-8.49578 0.03041427,-2.83194 0.06956522,-5.66387 0.1535338,-8.49432 0.0839675,-2.83043 0.21273148,-5.65937 0.39278033,-8.48685 C 1.7461082,118.73349 3.2868756,107.44752 6.2252558,96.443145 9.1636308,85.438718 13.499618,74.715862 19.405802,64.75706 25.311982,54.798254 32.788355,45.603504 41.560799,37.592267 50.333244,29.581075 60.401754,22.753358 71.307036,17.359568 82.212321,11.965864 93.954372,8.00609 106.00475,5.323576 c 12.05037,-2.6825142 24.40907,-4.0877672 36.79363,-4.74705812 3.09613,-0.16502755 6.1939,-0.28290136 9.29333,-0.36005739 3.09943,-0.076726 6.20053,-0.11230558 9.30161,-0.14016393 3.10107,-0.02573625 6.20213,-0.04757907 9.30324,-0.05915392 C 173.79767,0.00429572 176.89885,0 180,0 H 0 V 162 z"/>
+        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"/>
 </vector>
--- a/akita/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml
+++ b/akita/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml
@ -18,5 +18,5 @@
        android:viewportHeight="162">
    <path
        android:fillColor="#000000"
-        android:pathData="m 0,160.91275 c 0,-2.83202 0.00434187,-5.664 0.01727217,-8.49597 0.01295148,-2.83199 0.03459728,-5.66388 0.06499037,-8.49578 0.03041427,-2.83194 0.06956522,-5.66387 0.1535338,-8.49432 0.0839675,-2.83043 0.21273148,-5.65937 0.39278033,-8.48685 C 1.7461082,118.73349 3.2868756,107.44752 6.2252558,96.443145 9.1636308,85.438718 13.499618,74.715862 19.405802,64.75706 25.311982,54.798254 32.788355,45.603504 41.560799,37.592267 50.333244,29.581075 60.401754,22.753358 71.307036,17.359568 82.212321,11.965864 93.954372,8.00609 106.00475,5.323576 c 12.05037,-2.6825142 24.40907,-4.0877672 36.79363,-4.74705812 3.09613,-0.16502755 6.1939,-0.28290136 9.29333,-0.36005739 3.09943,-0.076726 6.20053,-0.11230558 9.30161,-0.14016393 3.10107,-0.02573625 6.20213,-0.04757907 9.30324,-0.05915392 C 173.79767,0.00429572 176.89885,0 180,0 H 0 V 162 z"/>
+        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"/>
 </vector>
--- a/akita/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/akita/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@ -22,7 +22,7 @@
 <resources>
    <!-- Configure 13px of extra protection around the front-facing camera -->
    <string translatable="false" name="config_frontBuiltInDisplayCutoutProtection">
-        m 585.73821,68.395595 a 49.159131,60.602208 0 0 0 -91.47461,0 49.159131,60.602208 0 0 0 91.47461,0 Z
+        m 585.74,68.4 a 49.16,60.6 0 0 0 -91.47,0 49.16,60.6 0 0 0 91.47,0 Z
    </string>

    <!-- Camera 0 is the front camera -->