Merge "Update camera cutout" into main

This commit is contained in:
Kimi Hsu 2023-10-30 02:08:33 +00:00 committed by Android (Google) Code Review
commit 5f58affc46
4 changed files with 9 additions and 12 deletions

View file

@ -252,12 +252,12 @@
<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
m 581.5,86.5 a 42,42 0 0 0 -84,0 42,42 0 0 0 84,0 z
@left
</string>
<string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">
m 485.5,0 h 110 v 121 h -110 Z
m 484.5,20.5 h 110 v 121 h -110 z
@left
</string>
<!-- A string config in svg path format for the main display shape.

View file

@ -14,9 +14,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="196px"
android:height="196px"
android:viewportWidth="33.4"
android:viewportHeight="33.4">
android:viewportWidth="196"
android:viewportHeight="196">
<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"/>
android:pathData="M 0,195 C 0.15,160.29 -1.48,124.41 10.98,91.35 24.1,54.94 53.7,25.02 89.96,11.51 123.37,-1.52 159.83,0.16 195,0 H 0 V 195 Z"/>
</vector>

View file

@ -14,9 +14,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="196px"
android:height="196px"
android:viewportWidth="33.4"
android:viewportHeight="33.4">
android:viewportWidth="196"
android:viewportHeight="196">
<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"/>
android:pathData="M 0,195 C 0.15,160.29 -1.48,124.41 10.98,91.35 24.1,54.94 53.7,25.02 89.96,11.51 123.37,-1.52 159.83,0.16 195,0 H 0 V 195 Z"/>
</vector>

View file

@ -49,10 +49,7 @@
<!-- Configure 13px of extra protection around the front-facing camera -->
<string translatable="false" name="config_frontBuiltInDisplayCutoutProtection">
M 489.5,66
a 50,50 0 0 1 100,0
a 50,50 0 0 1 -100,0
Z
m 594.5,86.5 a 55,55 0 0 0 -110,0 55,55 0 0 0 110,0 z
</string>
<!-- The time (in ms) needed to trigger the lock icon view's long-press affordance -->