summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-10-25 23:01:18 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-10-25 23:01:18 +0000
commit0bdacdb4d329763d4057d64413eefb3ffc21032e (patch)
tree40da4d6e77000f9c929f38f595d00692ea9f8901
parentbd2b257d8a47f2f11c07fb28d342d0ade1e61106 (diff)
parent3ec6c7a2723eb93a94aeff8e70a482d8174ee46e (diff)
downloadredfin-0bdacdb4d329763d4057d64413eefb3ffc21032e.tar.gz
Snap for 7852542 from 3ec6c7a2723eb93a94aeff8e70a482d8174ee46e to sc-d2-release
Change-Id: I7f0f230ecea26b8f94008791e114d5b3fd21fdb8
-rwxr-xr-xredfin/overlay/frameworks/base/core/res/res/values/config.xml14
-rw-r--r--redfin/overlay/frameworks/base/packages/SystemUI/res/values/config.xml4
2 files changed, 8 insertions, 10 deletions
diff --git a/redfin/overlay/frameworks/base/core/res/res/values/config.xml b/redfin/overlay/frameworks/base/core/res/res/values/config.xml
index 3b1bed0..a2ac121 100755
--- a/redfin/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/redfin/overlay/frameworks/base/core/res/res/values/config.xml
@@ -218,9 +218,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>
@@ -234,12 +234,10 @@
rounded_corner_radius to more accurately provide a "radius" for the rounded corners.-->
<dimen name="rounded_corner_radius_adjustment">8px</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 (48dp to reduce scrolling) -->
- <dimen name="quick_qs_offset_height">48dp</dimen>
+ <!-- Height of the status bar.
+ Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
+ -->
+ <dimen name="status_bar_height">28dp</dimen>
<!-- Not allow to switch to higher refresh rate when display brightness setting is
equal or less than this value -->
diff --git a/redfin/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/redfin/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index 396c6c5..1dcedb0 100644
--- a/redfin/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/redfin/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -59,8 +59,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. -->