Evolution-X-Tensor/device_google_felix
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Update cutout & rounded corner configs" into tm-qpr-dev

Browse source
This commit is contained in:
Shawn Lin 2022-09-21 02:33:17 +00:00 • committed by Android (Google) Code Review
commit 6f6455d9b5
4 changed files with 21 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

20
felix/overlay/frameworks/base/core/res/res/values/config.xml
View file

@ -74,17 +74,15 @@
<!-- Display cutout configuration --> <!-- Display cutout configuration -->
<string translatable="false" name="config_secondaryBuiltInDisplayCutout"> <string translatable="false" name="config_secondaryBuiltInDisplayCutout">
M 505,61 m 576.2,66.53 a 36.5,36.5 0 0 1 -36.5,36.5 36.5,36.5 0 0 1 -36.5,-36.5 36.5,36.5 0 0 1 36.5,-36.5 36.5,36.5 0 0 1 36.5,36.5 z
a 35,35 0 1 0 70,0 35,35 0 1 0 -70,0
Z
@left @left
</string> </string>
<string translatable="false" name="config_secondaryBuiltInDisplayCutoutRectApproximation"> <string translatable="false" name="config_secondaryBuiltInDisplayCutoutRectApproximation">
M 480,0 M 503.2,0
h 110 h 73
v 110 v 103
h -110 h 73
Z Z
@left @left
</string> </string>
@ -230,13 +228,13 @@
orientation. If zero, the value of rounded_corner_radius is used. --> orientation. If zero, the value of rounded_corner_radius is used. -->
<dimen name="rounded_corner_radius_top">52px</dimen> <dimen name="rounded_corner_radius_top">52px</dimen>
<!-- For secondary display --> <!-- For secondary display -->
<dimen name="secondary_rounded_corner_radius_top">52px</dimen> <dimen name="secondary_rounded_corner_radius_top">91px</dimen>
<!-- Radius of the software rounded corners at the bottom of primary display in its natural <!-- Radius of the software rounded corners at the bottom of primary display in its natural
orientation. If zero, the value of rounded_corner_radius is used. --> orientation. If zero, the value of rounded_corner_radius is used. -->
<dimen name="rounded_corner_radius_bottom">48px</dimen> <dimen name="rounded_corner_radius_bottom">48px</dimen>
<!-- For secondary display --> <!-- For secondary display -->
<dimen name="secondary_rounded_corner_radius_bottom">48px</dimen> <dimen name="secondary_rounded_corner_radius_bottom">91px</dimen>
<!-- Top adjustment for the software rounded corners since corners are not perfectly <!-- Top adjustment for the software rounded corners since corners are not perfectly
round. This value is used when retrieving the "radius" of the top rounded corner in cases round. This value is used when retrieving the "radius" of the top rounded corner in cases
@ -244,8 +242,6 @@
rounded_corner_radius_top to more accurately provide a "radius" for the top rounded corners. rounded_corner_radius_top to more accurately provide a "radius" for the top rounded corners.
--> -->
<dimen name="rounded_corner_radius_top_adjustment">5px</dimen> <dimen name="rounded_corner_radius_top_adjustment">5px</dimen>
<!-- For secondary display -->
<dimen name="secondary_rounded_corner_radius_top_adjustment">5px</dimen>
<!-- Bottom adjustment for the software rounded corners since corners are not perfectly <!-- Bottom adjustment for the software rounded corners since corners are not perfectly
round. This value is used when retrieving the "radius" of the bottom rounded corner in round. This value is used when retrieving the "radius" of the bottom rounded corner in
@ -253,8 +249,6 @@
rounded_corner_radius_bottom to more accurately provide a "radius" for the bottom rounded rounded_corner_radius_bottom to more accurately provide a "radius" for the bottom rounded
corners. --> corners. -->
<dimen name="rounded_corner_radius_bottom_adjustment">4px</dimen> <dimen name="rounded_corner_radius_bottom_adjustment">4px</dimen>
<!-- For secondary display -->
<dimen name="secondary_rounded_corner_radius_bottom_adjustment">4px</dimen>
<!-- the number of the max cached processes in the system. --> <!-- the number of the max cached processes in the system. -->
<integer name="config_customizedMaxCachedProcesses">64</integer> <integer name="config_customizedMaxCachedProcesses">64</integer>

10
felix/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom_secondary.xml
View file

@ -12,13 +12,13 @@
limitations under the License. limitations under the License.
--> -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="104px" android:width="124px"
android:height="104px" android:height="124px"
android:viewportWidth="104" android:viewportWidth="124"
android:viewportHeight="104"> android:viewportHeight="124">
<path <path
android:fillColor="#000000" android:fillColor="#000000"
android:pathData="M 104,0 C 86,0.036 61,0.26 51,0.7 48.43,0.82 45.77,1.16 43.81,1.42 41.66,1.7 38.64,2.35 36.36,3.06 34.07,3.77 31.98,4.52 27.59,6.65 23.21,8.79 20.47,10.65 18.19,12.53 c -2.32,1.89 -4.38,4.13 -5.84,5.84 -1.47,1.71 -2.15,2.69 -3.43,4.74 C 7.63,25.16 6.82,26.69 5.71,29.28 4.61,31.88 3.3,35.95 2.59,38.54 1.88,41.13 1.66,42.61 1.28,45 0.9,46.82 0.73,48 0.53,51 0.29,54.45 0.02,78 0,104 V 0 Z" /> android:pathData="m -0.2595961,0.2591722 c -1.605,0 124.7041761,-0.01235 123.0991761,2.75e-4 -1.7445,0.01372 -8.30417,0.05292 -10.04857,0.06376 -3.3442,0.06884 -6.6881,0.139273 -10.0322,0.207628 -3.333302,0.170329 -6.666902,0.340978 -10.000302,0.511466 -3.3011,0.32529 -6.6023,0.650099 -9.9033,0.975068 -3.2531,0.522192 -6.5062,1.044224 -9.7593,1.566576 -3.1781,0.767279 -6.3565,1.534558 -9.5345,2.30179 -3.0552,1.044223 -6.1103,2.088686 -9.1653,3.133022 -2.9108,1.3374958 -5.8211,2.6747658 -8.7321,4.0121508 -2.7125,1.641095 -5.4253,3.282173 -8.1378,4.923267 -2.4934,1.939474 -4.9871,3.878963 -7.4803,5.818437 -2.231,2.221843 -4.462,4.443751 -6.6932,6.665614 -1.947504,2.47764 -3.895104,4.955266 -5.842904,7.432875 -1.6477,2.706737 -3.2956,5.413473 -4.9438,8.120226 -1.344,2.89325 -2.6855001,5.786468 -4.0284001,8.679701 -1.0503,3.047762 -2.0975,6.09551 -3.1463,9.143256 -0.7711,3.159613 -1.5405,6.319272 -2.3115,9.478881 -0.5226,3.24492 -1.0486,6.4898 -1.5729,9.734716 -0.3279,3.2875 -0.6526,6.57502 -0.9789,9.86256 -0.1704,3.31949 -0.3442,6.63898 -0.513,9.958439 -0.065,3.33016 -0.1461,6.66029 -0.2094,9.99044 0,3.33548 -0.048,6.67092 -0.065,10.00642 z" />
</vector> </vector>

10
felix/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top_secondary.xml
View file

@ -12,13 +12,13 @@
limitations under the License. limitations under the License.
--> -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="104px" android:width="124px"
android:height="104px" android:height="124px"
android:viewportWidth="104" android:viewportWidth="124"
android:viewportHeight="104"> android:viewportHeight="124">
<path <path
android:fillColor="#000000" android:fillColor="#000000"
android:pathData="M 104,0 C 86,0 61,0.26 51,0.7 48.43,0.82 45.77,1.16 43.81,1.42 41.66,1.7 38.64,2.35 36.36,3.06 34.07,3.77 31.98,4.52 27.59,6.65 23.21,8.79 20.47,10.65 18.19,12.53 c -2.32,1.89 -4.38,4.13 -5.84,5.84 -1.47,1.71 -2.15,2.69 -3.43,4.74 C 7.63,25.16 6.82,26.69 5.71,29.28 4.61,31.88 3.3,35.95 2.59,38.54 1.88,41.13 1.66,42.61 1.28,45 0.9,46.82 0.73,48 0.53,51 0.29,54.45 0,78 0,104 V 0 Z" /> android:pathData="m 122.58619,3.1999995e-5 c -3.33555,0 -6.67094,0.04334 -10.0064,0.06428 -3.33016,0.06899 -6.66029,0.139606 -9.99045,0.2085 -3.319464,0.171114 -6.638954,0.342375 -9.958454,0.513651 -3.28753,0.326645 -6.575051,0.652803 -9.862553,0.979123 -3.244921,0.524398 -6.489794,1.048633 -9.734715,1.573031 -3.159614,0.770461 -6.319272,1.540922 -9.478886,2.311389 -3.047745,1.048634 -6.095492,2.097377 -9.143254,3.146076 -2.893234,1.343005 -5.786451,2.685914 -8.679702,4.02888 -2.706754,1.64794 -5.41349,3.295865 -8.120226,4.943837 -2.477509,1.947547 -4.955135,3.895118 -7.432775,5.842655 -2.221863,2.231181 -4.443771,4.462284 -6.665614,6.693415 -1.939474,2.493252 -3.878963,4.986664 -5.818437,7.480076 -1.641094,2.712671 -3.282172,5.425344 -4.923267,8.138016 -1.337496,2.910586 -2.674769,5.821332 -4.012151,8.731916 -1.044223,3.055047 -2.088671,6.110095 -3.133022,9.165301 -0.76728,3.17816 -1.534559,6.356323 -2.30179,9.534484 -0.522193,3.25296 -1.044224,6.506078 -1.566576,9.759199 -0.325289,3.301114 -0.650098,6.602388 -0.975068,9.903822 -0.170329,3.333219 -0.340977,6.666605 -0.511466,9.999957 -0.06884,3.344 -0.139273,6.68795 -0.207628,10.03208 C 0.05422341,114.58394 0.00989647,121.56369 0,123.098 -0.0117079,124.91315 0.01100341,-1.8151271 -2.74e-4,0 Z" />
</vector> </vector>

9
felix/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
View file

@ -75,14 +75,11 @@
<!-- Configure 13px of extra protection around the front-facing camera --> <!-- Configure 13px of extra protection around the front-facing camera -->
<string translatable="false" name="config_frontBuiltInDisplayCutoutProtection"> <string translatable="false" name="config_frontBuiltInDisplayCutoutProtection">
M 494,65 m 589.2,66.53 a 49.5,49.5 0 0 1 -49.5,49.5 49.5,49.5 0 0 1 -49.5,-49.5 49.5,49.5 0 0 1 49.5,-49.5 49.5,49.5 0 0 1 49.5,49.5 z
a 46,46 0 1 0 92,0
a 46,46 0 1 0 -92,0
Z
</string> </string>
<!-- Camera 1 is the front camera on barbet --> <!-- Camera 0 is the front camera -->
<string translatable="false" name="config_protectedCameraId">1</string> <string translatable="false" name="config_protectedCameraId">0</string>
<!-- Comma-separated list of packages to exclude from camera protection. In our case, <!-- Comma-separated list of packages to exclude from camera protection. In our case,
ignore the gaze detection package --> ignore the gaze detection package -->