summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-06-19 04:21:34 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-06-19 04:21:34 +0000
commit4cc5e6bb7b9440955c26e4fffb6306f4d87b04c0 (patch)
treee8abbee0c5f8ef11bd36b9a0beb86350de60435b
parent17af18e6717a1ed6c8abecd15a60f441b902da20 (diff)
parent9272e67129c2e3dd5b15d50f6bca36e80b8b612b (diff)
downloadbonito-gki13-boot-release.tar.gz
Snap for 8743232 from 9272e67129c2e3dd5b15d50f6bca36e80b8b612b to gki13-boot-releasegki13-boot-release
Change-Id: I6de5c2ca021b0c48ae977f65fe31aff60ca39607
-rw-r--r--bonito/overlay/frameworks/base/core/res/res/values/dimens.xml3
-rw-r--r--device.mk2
-rw-r--r--sargo/overlay/frameworks/base/core/res/res/values/dimens.xml1
3 files changed, 4 insertions, 2 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 80714e93..d4caebf7 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 3ac623a7..03496519 100644
--- a/device.mk
+++ b/device.mk
@@ -879,7 +879,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
# 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 73c38da4..d4caebf7 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. -->