summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshawnlin <shawnlin@google.com>2021-09-17 20:08:01 +0800
committerShawn Lin <shawnlin@google.com>2021-10-15 05:46:01 +0000
commitb86e0b06314ea628da04fc6ee1a958a665f14fb0 (patch)
tree9c2d24e5f9f5fa4d9fdd6ddfb339055dbd4b0f2f
parentf566c94dcdf716cef26821d2b906c7decfa06c19 (diff)
downloadbramble-b86e0b06314ea628da04fc6ee1a958a665f14fb0.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: Ib3b0da9b4d844274a0ec62bc2e80164ae4441ab1
-rwxr-xr-xbramble/overlay/frameworks/base/core/res/res/values/config.xml14
-rw-r--r--bramble/overlay/frameworks/base/packages/SystemUI/res/values/config.xml4
2 files changed, 8 insertions, 10 deletions
diff --git a/bramble/overlay/frameworks/base/core/res/res/values/config.xml b/bramble/overlay/frameworks/base/core/res/res/values/config.xml
index fb844ad..6b3714b 100755
--- a/bramble/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/bramble/overlay/frameworks/base/core/res/res/values/config.xml
@@ -211,9 +211,9 @@
<string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">
M 0.0,0.0
- h 136
+ h 145
v 136
- h -136
+ h -145
Z
@left
</string>
@@ -228,12 +228,10 @@
-->
<dimen name="rounded_corner_radius_adjustment">16px</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">145px</dimen>
- <dimen name="status_bar_height_landscape">28dp</dimen>
- <!-- Height of area above QQS where battery/time go (equal to status bar) -->
- <dimen name="quick_qs_offset_height">145px</dimen>
+ <!-- Height of the status bar.
+ Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
+ -->
+ <dimen name="status_bar_height">28dp</dimen>
<!-- List of biometric sensors on the device, in decreasing strength. Consumed by AuthService
when registering authenticators with BiometricService. Format must be ID:Modality:Strength,
diff --git a/bramble/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/bramble/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index e0807e2..684714f 100644
--- a/bramble/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/bramble/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -37,8 +37,8 @@
<!-- Doze: whether the double tap sensor reports 2D touch coordinates -->
<bool name="doze_double_tap_reports_touch_coordinates">true</bool>
- <!-- 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>
<!-- Doze: Table that translates sensor values from the doze_brightness_sensor_type sensor
to brightness values; -1 means keeping the current brightness. -->