diff options
| author | Xin Li <delphij@google.com> | 2022-06-14 16:39:59 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2022-06-14 16:39:59 -0700 |
| commit | 7196a6b48d969c44412ac1865fce893cfd20a27d (patch) | |
| tree | e8abbee0c5f8ef11bd36b9a0beb86350de60435b | |
| parent | 4e31cff4d47da6f7e49cd6640b2a516ea42ce32b (diff) | |
| parent | 0c4a13f987a20bbd173858dc693817b447fac4ba (diff) | |
| download | bonito-7196a6b48d969c44412ac1865fce893cfd20a27d.tar.gz | |
Merge Android 12 QPR 3
Bug: 236045730
Merged-In: I42b6550860cc7446e6f6a4afec8a37dd9eaf3fff
Change-Id: I2e7b7fed48ebb2d3d6da0a1212f02118c18a72a8
| -rw-r--r-- | bonito/overlay/frameworks/base/core/res/res/values/dimens.xml | 3 | ||||
| -rw-r--r-- | device.mk | 2 | ||||
| -rw-r--r-- | sargo/overlay/frameworks/base/core/res/res/values/dimens.xml | 1 |
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> @@ -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. --> |