summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2022-04-18 23:39:46 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2022-04-18 23:39:46 +0000
commitdf85a7c065302ae32fc0818980abfee6e1123630 (patch)
tree3f3e4bd622bd2ca0af3f71c7e6d2a9b1fee208db
parent0f342bb96c8bf0862996f92e4aba6e2fc5a7e143 (diff)
parentef34d016293c9ce633588b0444d675556ae8ef9d (diff)
downloadsunfish-df85a7c065302ae32fc0818980abfee6e1123630.tar.gz
Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8433047" into stage-aosp-master
-rw-r--r--device.mk2
-rwxr-xr-xsunfish/overlay/frameworks/base/core/res/res/values/config.xml4
2 files changed, 4 insertions, 2 deletions
diff --git a/device.mk b/device.mk
index 8959f2c1..a21b3d89 100644
--- a/device.mk
+++ b/device.mk
@@ -880,7 +880,7 @@ PRODUCT_PACKAGES += $(HIDL_WRAPPER)
# Increment the SVN for any official public releases
PRODUCT_PROPERTY_OVERRIDES += \
- ro.vendor.build.svn=42
+ ro.vendor.build.svn=43
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
diff --git a/sunfish/overlay/frameworks/base/core/res/res/values/config.xml b/sunfish/overlay/frameworks/base/core/res/res/values/config.xml
index e6c19b31..b0804728 100755
--- a/sunfish/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/sunfish/overlay/frameworks/base/core/res/res/values/config.xml
@@ -203,7 +203,9 @@
<!-- 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">136px</dimen>
+ <dimen name="status_bar_height_landscape">28dp</dimen>
<!-- the number of the max cached processes in the system. -->
<integer name="config_customizedMaxCachedProcesses">64</integer>