diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-10-25 23:01:22 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-10-25 23:01:22 +0000 |
| commit | e83a53425c7059abb05306fec4bfd2caa4e87c85 (patch) | |
| tree | 5f5857bbd8c7749c8e7ef6214bad7945a994fccc | |
| parent | 2b5fbeff11a26c1a9246252adde8fbaf32b697a8 (diff) | |
| parent | 0d175cd5f6d578e044929f702550b65bfff0598e (diff) | |
| download | crosshatch-e83a53425c7059abb05306fec4bfd2caa4e87c85.tar.gz | |
Snap for 7852542 from 0d175cd5f6d578e044929f702550b65bfff0598e to sc-d2-release
Change-Id: Ia4a72234e5577283031f37b5b0cd491ea77594f0
4 files changed, 12 insertions, 16 deletions
diff --git a/blueline/overlay/frameworks/base/core/res/res/values/dimens.xml b/blueline/overlay/frameworks/base/core/res/res/values/dimens.xml index 47123621..31bd5a4e 100644 --- a/blueline/overlay/frameworks/base/core/res/res/values/dimens.xml +++ b/blueline/overlay/frameworks/base/core/res/res/values/dimens.xml @@ -24,10 +24,10 @@ <!-- Adjustment for software rounded corners since corners aren't perfectly round. --> <dimen name="rounded_corner_radius_adjustment">0px</dimen> - <!-- 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">28dp</dimen> - <dimen name="status_bar_height_landscape">24dp</dimen> + <!-- Height of the status bar. + Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead. + --> + <dimen name="status_bar_height">28dp</dimen> <dimen name="quick_qs_offset_height">28dp</dimen> </resources> diff --git a/blueline/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/blueline/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index ebfdcb1c..f9bd6ade 100644 --- a/blueline/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/blueline/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -21,8 +21,8 @@ <!-- the padding on the top of the statusbar (usually 0) --> <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> + <!-- 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</dimen> <!-- Margin on the right side of the system icon group on Keyguard. --> <dimen name="system_icons_keyguard_padding_end">9dp</dimen> diff --git a/crosshatch/overlay/frameworks/base/core/res/res/values/config.xml b/crosshatch/overlay/frameworks/base/core/res/res/values/config.xml index 45aff2c1..516e0bab 100755 --- a/crosshatch/overlay/frameworks/base/core/res/res/values/config.xml +++ b/crosshatch/overlay/frameworks/base/core/res/res/values/config.xml @@ -729,14 +729,10 @@ --> <bool name="config_fillMainBuiltInDisplayCutout">true</bool> - <!-- Height of the status bar --> - <dimen name="status_bar_height_portrait">171px</dimen> - <dimen name="status_bar_height_landscape">28dp</dimen> - <!-- Height of area above QQS where battery/time go (equal to status bar height if > 48dp) --> - <dimen name="quick_qs_offset_height">171px</dimen> - <!-- Total height of QQS (quick_qs_offset_height + 128dp) --> - <dimen name="quick_qs_total_height">177dp</dimen> - + <!-- Height of the status bar. + Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead. + --> + <dimen name="status_bar_height">28dp</dimen> <dimen name="rounded_corner_radius_top">133px</dimen> <dimen name="rounded_corner_radius_bottom">70px</dimen> diff --git a/crosshatch/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/crosshatch/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index c0fe31bb..3752f761 100644 --- a/crosshatch/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/crosshatch/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -20,8 +20,8 @@ <dimen name="display_cutout_margin_consumption">0px</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> + <!-- 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</dimen> <!-- Margin on the right side of the system icon group on Keyguard. --> <dimen name="system_icons_keyguard_padding_end">9dp</dimen> |