summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshawnlin <shawnlin@google.com>2021-09-17 20:15:34 +0800
committerBruno Martins <bgcngm@gmail.com>2022-03-31 19:45:37 +0200
commit359e04399402516368f81f1ad4db1bca62e80df3 (patch)
tree3e3f0571282c75f2b3d2d024689397368f371cc9
parentf52f5b347d599312bf0c6fa553a59b94bd159002 (diff)
kebab: 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: I36d869866ed03d3996b7b0d8cc6d3f6bb6ab624d
-rw-r--r--overlay/frameworks/base/core/res/res/values/dimens.xml7
-rw-r--r--overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml2
2 files changed, 5 insertions, 4 deletions
diff --git a/overlay/frameworks/base/core/res/res/values/dimens.xml b/overlay/frameworks/base/core/res/res/values/dimens.xml
index 733f4d7..289d626 100644
--- a/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -18,9 +18,10 @@
*/
-->
<resources>
- <!-- 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">104px</dimen>
+ <!-- Height of the status bar.
+ Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
+ -->
+ <dimen name="status_bar_height">28dp</dimen>
<!-- Default radius of the software rounded corners. -->
<dimen name="rounded_corner_radius">8dp</dimen>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index efaa0e8..87fb32a 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -26,7 +26,7 @@
<dimen name="status_bar_padding_end">28px</dimen>
<!-- Height of the status bar header bar when on Keyguard -->
- <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>
<!-- Margin on the left side of the carrier text on Keyguard -->
<dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>