diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-10-27 23:01:42 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-10-27 23:01:42 +0000 |
| commit | 77286740f13b39e573bcfdeb8cf4ab10e0e11f97 (patch) | |
| tree | 3b7754449d7abdd1b76735605a6856f07068a701 | |
| parent | 9d6efddfa5bbf6d0292489a6fd24c27cb58d316e (diff) | |
| parent | 5a63ff26d6356b3a2877ea1ab5c21fe4f12382bb (diff) | |
| download | bonito-77286740f13b39e573bcfdeb8cf4ab10e0e11f97.tar.gz | |
Snap for 7859607 from 5a63ff26d6356b3a2877ea1ab5c21fe4f12382bb to sc-v2-release
Change-Id: I90fdb60697414ab70a7f1c0fd2502cad650a435d
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> |