Adjust status bar rounded corner and display cutout region
- Customize status_bar_height_portrait/landscape/keyguard
- Adjust punch hole display cutout region
- Adjust rounded radius for window corner
Test: atest SystemUITests
Test: atest android.systemui.cts.WindowInsetsBehaviorTests
Test: manual check visual
Bug: 190381022
Change-Id: If98f721f3e20270c5edfdc3b2f34ff8b8af41de4
Merged-In: If98f721f3e20270c5edfdc3b2f34ff8b8af41de4
diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml
index 06da015..3cc2c9f 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -33,17 +33,17 @@
</string>
<string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">
- M 655,0
- h 126
+ M 653,0
+ h 130
v 130
- h -126
+ h -130
Z
@left
</string>
<!-- Radius of the software rounded corners. -->
- <dimen name="rounded_corner_radius">25px</dimen>
+ <dimen name="rounded_corner_radius">38px</dimen>
<!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
<dimen name="rounded_corner_radius_adjustment">5px</dimen>
@@ -179,4 +179,15 @@
<!-- The duration (in milliseconds) that should be applied to waveform vibrations that ends in
non-zero amplitudes, to bring the vibrator amplitude down to zero using this timing. -->
<integer name="config_vibrationWaveformRampDownDuration">50</integer>
+
+ <!-- Height of the status bar in portrait. The height should be
+ Max((status bar content height + waterfall top size), top cutout size) -->
+ <dimen name="status_bar_height_portrait">145px</dimen>
+ <dimen name="status_bar_height_landscape">28dp</dimen>
+
+ <!-- Height of area above QQS where battery/time go (equal to status bar) -->
+ <dimen name="quick_qs_offset_height">145px</dimen>
+
+ <!-- Height of the status bar header bar when on Keyguard (match status_bar_portrait) -->
+ <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height_portrait</dimen>
</resources>
diff --git a/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 9de5e14..68c8115 100644
--- a/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -17,7 +17,10 @@
-->
<resources>
<!-- for 20dp of padding at 3.5px/dp at default density -->
- <dimen name="rounded_corner_content_padding">5px</dimen>
+ <dimen name="rounded_corner_content_padding">50px</dimen>
+
+ <!-- the padding on the top of the statusbar (usually 0) -->
+ <dimen name="status_bar_padding_top">1px</dimen>
<!-- Padding for the system icons on the keyguard (when no multi user switch is showing).
The icons always have a 4dp padding in the container so we only need 56 extra px of padding
@@ -44,7 +47,6 @@
<bool name="config_enableDisplayCutoutProtection">true</bool>
-
<!-- Location on the screen of the center of the physical power button. -->
<dimen name="physical_power_button_center_screen_location_y">940px</dimen>