diff options
| author | shawnlin <shawnlin@google.com> | 2021-10-13 13:03:53 +0800 |
|---|---|---|
| committer | shawnlin <shawnlin@google.com> | 2021-10-13 13:03:53 +0800 |
| commit | 5a63ff26d6356b3a2877ea1ab5c21fe4f12382bb (patch) | |
| tree | 3b7754449d7abdd1b76735605a6856f07068a701 | |
| parent | e4ef88098cf6b1e1453e7984999f954da559c273 (diff) | |
| download | bonito-5a63ff26d6356b3a2877ea1ab5c21fe4f12382bb.tar.gz | |
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: Idf1ebe47409aa96573af4c303db407625a59627c
4 files changed, 11 insertions, 11 deletions
diff --git a/bonito/overlay/frameworks/base/core/res/res/values/dimens.xml b/bonito/overlay/frameworks/base/core/res/res/values/dimens.xml index 0a7c4e5b..80714e93 100644 --- a/bonito/overlay/frameworks/base/core/res/res/values/dimens.xml +++ b/bonito/overlay/frameworks/base/core/res/res/values/dimens.xml @@ -23,10 +23,10 @@ <dimen name="rounded_corner_radius_top">38px</dimen> <dimen name="rounded_corner_radius_bottom">39px</dimen> - <!-- Height of the status bar --> - <dimen name="status_bar_height_portrait">28dp</dimen> - <!-- Height of area above QQS where battery/time go (equal to status bar) --> - <dimen name="quick_qs_offset_height">28dp</dimen> + <!-- Height of the status bar. + Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead. + --> + <dimen name="status_bar_height">28dp</dimen> <!-- Adjustment for software rounded corners since corners aren't perfectly round. --> <dimen name="rounded_corner_radius_adjustment">3px</dimen> diff --git a/bonito/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/bonito/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index 8295f934..22291ffb 100644 --- a/bonito/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/bonito/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -18,8 +18,8 @@ <resources> <dimen name="rounded_corner_content_padding">28px</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">8.5dp</dimen> diff --git a/sargo/overlay/frameworks/base/core/res/res/values/dimens.xml b/sargo/overlay/frameworks/base/core/res/res/values/dimens.xml index 0a7c4e5b..73c38da4 100644 --- a/sargo/overlay/frameworks/base/core/res/res/values/dimens.xml +++ b/sargo/overlay/frameworks/base/core/res/res/values/dimens.xml @@ -23,10 +23,10 @@ <dimen name="rounded_corner_radius_top">38px</dimen> <dimen name="rounded_corner_radius_bottom">39px</dimen> - <!-- Height of the status bar --> + <!-- Height of the status bar. + Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead. + --> <dimen name="status_bar_height_portrait">28dp</dimen> - <!-- Height of area above QQS where battery/time go (equal to status bar) --> - <dimen name="quick_qs_offset_height">28dp</dimen> <!-- Adjustment for software rounded corners since corners aren't perfectly round. --> <dimen name="rounded_corner_radius_adjustment">3px</dimen> diff --git a/sargo/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/sargo/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index 01c0d468..c5a50ec3 100644 --- a/sargo/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/sargo/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -18,8 +18,8 @@ <resources> <dimen name="rounded_corner_content_padding">28px</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> |