Merge sc-v2-dev-plus-aosp-without-vendor@8433047
Bug: 226662282
Merged-In: I34050f4f12e36e671bddc3ffeb7fe17a8a19a929
Change-Id: Idfcfd64cf47aaf2cc2a06ae199b1085b54ee3652
diff --git a/device-oriole.mk b/device-oriole.mk
index e22e0b3..e0315be 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -175,7 +175,7 @@
# Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \
- ro.vendor.build.svn=25
+ ro.vendor.build.svn=26
# Hide cutout overlays
PRODUCT_PACKAGES += \
diff --git a/device-raven.mk b/device-raven.mk
index 4f16dc5..c7c5943 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -187,7 +187,7 @@
# Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \
- ro.vendor.build.svn=25
+ ro.vendor.build.svn=26
# Hide cutout overlays
PRODUCT_PACKAGES += \
diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
index 6eec9d0..574eed6 100644
--- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
@@ -93,7 +93,9 @@
<!-- Height of the status bar.
Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
-->
- <dimen name="status_bar_height_height">74px</dimen>
+ <dimen name="status_bar_height_height_default">74px</dimen>
+ <dimen name="status_bar_height_portrait">124px</dimen>
+ <dimen name="status_bar_height_landscape">74px</dimen>
<!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
<dimen name="rounded_corner_radius_adjustment">5px</dimen>
diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml
index a83a4e4..8d422c3 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -198,7 +198,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">145px</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>