Remove resource overlays for system bar heights

With the new added APIs, we don't need to overlay status_bar_height that
contains cutout size and quick_qs_offset_height anymore.

Bug: 186604541
Test: make
Change-Id: Ib2ebacbc3250a1c2a2ad2b26f92eda6651fec37a
This commit is contained in:
shawnlin 2021-09-17 20:13:40 +08:00 committed by Shawn Lin
parent eed6ffebc3
commit b7cc9eee54
4 changed files with 16 additions and 21 deletions

View file

@ -80,9 +80,9 @@
<string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation"> <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">
M 492,0 M 492,0
h 118 h 124
v 118 v 118
h -118 h -124
Z Z
@left @left
</string> </string>
@ -90,12 +90,10 @@
<!-- Radius of the software rounded corners. --> <!-- Radius of the software rounded corners. -->
<dimen name="rounded_corner_radius">28px</dimen> <dimen name="rounded_corner_radius">28px</dimen>
<!-- Height of the status bar in portrait. The height should be <!-- Height of the status bar.
Max((status bar content height + waterfall top size), top cutout size) --> Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
<dimen name="status_bar_height_portrait">124px</dimen> -->
<dimen name="status_bar_height_landscape">74px</dimen> <dimen name="status_bar_height_height">74px</dimen>
<!-- Height of area above QQS where battery/time go (equal to status bar) -->
<dimen name="quick_qs_offset_height">124px</dimen>
<!-- Adjustment for software rounded corners since corners aren't perfectly round. --> <!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
<dimen name="rounded_corner_radius_adjustment">5px</dimen> <dimen name="rounded_corner_radius_adjustment">5px</dimen>

View file

@ -25,8 +25,8 @@
<!-- the padding on the top of the statusbar (usually 0) --> <!-- the padding on the top of the statusbar (usually 0) -->
<dimen name="status_bar_padding_top">1px</dimen> <dimen name="status_bar_padding_top">1px</dimen>
<!-- Height of the status bar header bar when on Keyguard (match status_bar_portrait) --> <!-- Height of the status bar header bar when on Keyguard (match status_bar_height) -->
<dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height_portrait</dimen> <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</dimen>
<!-- Padding for the system icons on the keyguard (when no multi user switch is showing). <!-- 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 26 extra px of padding The icons always have a 4dp padding in the container so we only need 26 extra px of padding

View file

@ -34,9 +34,9 @@
<string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation"> <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">
M 653,0 M 653,0
h 130 h 145
v 130 v 130
h -130 h -145
Z Z
@left @left
</string> </string>
@ -195,13 +195,10 @@
non-zero amplitudes, to bring the vibrator amplitude down to zero using this timing. --> non-zero amplitudes, to bring the vibrator amplitude down to zero using this timing. -->
<integer name="config_vibrationWaveformRampDownDuration">50</integer> <integer name="config_vibrationWaveformRampDownDuration">50</integer>
<!-- Height of the status bar in portrait. The height should be <!-- Height of the status bar.
Max((status bar content height + waterfall top size), top cutout size) --> Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
<dimen name="status_bar_height_portrait">145px</dimen> -->
<dimen name="status_bar_height_landscape">28dp</dimen> <dimen name="status_bar_height">28dp</dimen>
<!-- Height of area above QQS where battery/time go (equal to status bar) -->
<dimen name="quick_qs_offset_height">145px</dimen>
<!-- If face auth sends the user directly to home/last open app, or stays on keyguard by default--> <!-- If face auth sends the user directly to home/last open app, or stays on keyguard by default-->
<bool name="config_faceAuthDismissesKeyguard">false</bool> <bool name="config_faceAuthDismissesKeyguard">false</bool>

View file

@ -22,8 +22,8 @@
<!-- the padding on the top of the statusbar (usually 0) --> <!-- the padding on the top of the statusbar (usually 0) -->
<dimen name="status_bar_padding_top">1px</dimen> <dimen name="status_bar_padding_top">1px</dimen>
<!-- Height of the status bar header bar when on Keyguard (match status_bar_portrait) --> <!-- Height of the status bar header bar when on Keyguard (match status_bar_height) -->
<dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height_portrait</dimen> <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</dimen>
<!-- Padding for the system icons on the keyguard (when no multi user switch is showing). <!-- 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 26 extra px of padding The icons always have a 4dp padding in the container so we only need 26 extra px of padding