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

Fix KeyguardStatusBar height not align StatusBar am: 3d20a7d96a am: d1b2e8f610 am: f504706fa1

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/15421872

Change-Id: I0b1787d3e5c7fce8ae2f2d256dbf8ee35fed6690
This commit is contained in:
Bill Lin 2021-08-03 07:55:18 +00:00 • committed by Automerger Merge Worker
commit f4ab42644f
4 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
oriole/overlay/frameworks/base/core/res/res/values/config.xml
View file

@ -79,7 +79,7 @@
</string> </string>
<string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation"> <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">
M 480,0 M 492,0
h 118 h 118
v 118 v 118
h -118 h -118
@ -88,14 +88,14 @@
</string> </string>
<!-- Radius of the software rounded corners. --> <!-- Radius of the software rounded corners. -->
<dimen name="rounded_corner_radius">25px</dimen> <dimen name="rounded_corner_radius">28px</dimen>
<!-- Height of the status bar in portrait. The height should be <!-- Height of the status bar in portrait. The height should be
Max((status bar content height + waterfall top size), top cutout size) --> Max((status bar content height + waterfall top size), top cutout size) -->
<dimen name="status_bar_height_portrait">118px</dimen> <dimen name="status_bar_height_portrait">124px</dimen>
<dimen name="status_bar_height_landscape">74px</dimen> <dimen name="status_bar_height_landscape">74px</dimen>
<!-- Height of area above QQS where battery/time go (equal to status bar) --> <!-- Height of area above QQS where battery/time go (equal to status bar) -->
<dimen name="quick_qs_offset_height">118px</dimen> <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>

15
oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
View file

@ -25,13 +25,16 @@
<!-- 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>
<!-- Padding for the system icons on the keyguard (when no multi user switch is showing). <!-- Height of the status bar header bar when on Keyguard (match status_bar_portrait) -->
The icons always have a 4dp padding in the container so we only need 56 extra px of padding <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height_portrait</dimen>
for the corners -->
<dimen name="system_icons_super_container_avatarless_margin_end">11px</dimen>
<!-- Multi user switch has some intrinsic padding to it --> <!-- Padding for the system icons on the keyguard (when no multi user switch is showing).
<dimen name="multi_user_switch_keyguard_margin">40px</dimen> The icons always have a 4dp padding in the container so we only need 26 extra px of padding
for the corners -->
<dimen name="system_icons_super_container_avatarless_margin_end">26px</dimen>
<!-- Margin on the right side of the system icon group on Keyguard. -->
<dimen name="system_icons_keyguard_padding_end">6dp</dimen>
<dimen name="keyguard_carrier_text_margin">0px</dimen> <dimen name="keyguard_carrier_text_margin">0px</dimen>

5
raven/overlay/frameworks/base/core/res/res/values/config.xml
View file

@ -43,7 +43,7 @@
<!-- Radius of the software rounded corners. --> <!-- Radius of the software rounded corners. -->
<dimen name="rounded_corner_radius">38px</dimen> <dimen name="rounded_corner_radius">50px</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>
@ -200,9 +200,6 @@
<!-- Height of area above QQS where battery/time go (equal to status bar) --> <!-- Height of area above QQS where battery/time go (equal to status bar) -->
<dimen name="quick_qs_offset_height">145px</dimen> <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>
<!-- 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>

10
raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
View file

@ -22,10 +22,16 @@
<!-- 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) -->
<dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height_portrait</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 56 extra px of padding The icons always have a 4dp padding in the container so we only need 26 extra px of padding
for the corners --> for the corners -->
<dimen name="system_icons_super_container_avatarless_margin_end">11px</dimen> <dimen name="system_icons_super_container_avatarless_margin_end">26px</dimen>
<!-- Margin on the right side of the system icon group on Keyguard. -->
<dimen name="system_icons_keyguard_padding_end">10dp</dimen>
<!-- A path similar to frameworks/base/core/res/res/values/config.xml <!-- 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 config_mainBuiltInDisplayCutout that describes a path larger than the exact path of a display