[automerger skipped] Merge SP2A.220505.002 am: 3358d824f3 -s ours
am skip reason: Merged-In Ic2ed06886679671a04a35f86665cb147b8103905 with SHA-1 2f02dcb4ff is already in history
Original change: https://android-review.googlesource.com/c/device/google/bonito/+/2085708
Change-Id: Ie67eaf95f66dde6efecfdeb814b510e2c24223b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 80714e9..d4caebf 100644
--- a/bonito/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/bonito/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -26,7 +26,8 @@
<!-- Height of the status bar.
Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
-->
- <dimen name="status_bar_height">28dp</dimen>
+ <dimen name="status_bar_height_default">28dp</dimen>
+ <dimen name="status_bar_height_portrait">28dp</dimen>
<!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
<dimen name="rounded_corner_radius_adjustment">3px</dimen>
diff --git a/device.mk b/device.mk
index 3ac623a..0349651 100644
--- a/device.mk
+++ b/device.mk
@@ -879,7 +879,7 @@
# Increment the SVN for any official public releases
PRODUCT_PROPERTY_OVERRIDES += \
- ro.vendor.build.svn=57
+ ro.vendor.build.svn=58
# Vendor verbose logging default property
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
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 73c38da..d4caebf 100644
--- a/sargo/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/sargo/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -26,6 +26,7 @@
<!-- Height of the status bar.
Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
-->
+ <dimen name="status_bar_height_default">28dp</dimen>
<dimen name="status_bar_height_portrait">28dp</dimen>
<!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
