Update C10/P10 SysUI overlay customization
1. [C10]Remove duplicate config_frontBuiltInDisplayCutoutProtection
2. [C10]Shift right config_frontBuiltInDisplayCutoutProtection position
3. [P10]Shift down config_frontBuiltInDisplayCutoutProtection position
Test: make and flash + enable rounded corner debug + launch front camera
Bug: 199469413
Bug: 203593020
Bug: 199468172
Change-Id: Iec8aaefe9ac649940d2364a95c12c75b69e34871
diff --git a/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index e9b9155..74e3c86 100644
--- a/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -24,13 +24,13 @@
<!-- Configure 13px of extra protection around the front-facing camera -->
<string translatable="false" name="config_frontBuiltInDisplayCutoutProtection">
- M 661,72
+ M 662,72
a 57,57 0 1 0 114,0
a 57,57 0 1 0 -114,0
Z
</string>
- <!-- Camera 1 is the front camera on barbet -->
+ <!-- Camera 1 is the front camera on C10 -->
<string translatable="false" name="config_protectedCameraId">1</string>
<!-- Comma-separated list of packages to exclude from camera protection. In our case,
diff --git a/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 6d0894d..7027f07 100644
--- a/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -30,21 +30,6 @@
<!-- Margin on the right side of the system icon group on Keyguard. -->
<dimen name="system_icons_keyguard_padding_end">6.5dp</dimen>
- <!-- A path similar to frameworks/base/core/res/res/values/config.xml
- config_mainBuiltInDisplayCutout that describes a path larger than the exact path of a display
- cutout. If present as well as config_enableDisplayCutoutProtection is set to true, then
- SystemUI will draw this "protection path" instead of the display cutout path that is normally
- used for anti-aliasing.
-
- This path will only be drawn when the front-facing camera turns on, otherwise the main
- DisplayCutout path will be rendered
- -->
- <string translatable="false" name="config_frontBuiltInDisplayCutoutProtection">
- M 665,71
- a 57,57 0 1 0 114,0 57,57 0 1 0 -114,0
- Z
- </string>
-
<!-- Camera 1 is the front camera -->
<string translatable="false" name="config_protectedCameraId">1</string>
diff --git a/panther/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/panther/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index 7568d21..949c138 100644
--- a/panther/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/panther/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -30,13 +30,13 @@
<!-- Configure 13px of extra protection around the front-facing camera -->
<string translatable="false" name="config_frontBuiltInDisplayCutoutProtection">
- M 494,66
+ M 494,67
a 46,46 0 1 0 92,0
a 46,46 0 1 0 -92,0
Z
</string>
- <!-- Camera 1 is the front camera on barbet -->
+ <!-- Camera 1 is the front camera on P10 -->
<string translatable="false" name="config_protectedCameraId">1</string>
<!-- Comma-separated list of packages to exclude from camera protection. In our case,
