From b95b719a43f562e8e74ce374eac202f7150f45e6 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Sun, 30 Jan 2022 04:34:16 +0000 Subject: Update bonito SVN to 56 Bug: 216579780 Change-Id: Ia4661819b2f7ad4cef86d026c97ce07c3be8e005 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 3cba50d0..f686999a 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=55 + ro.vendor.build.svn=56 # Vendor verbose logging default property ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) -- cgit v1.2.3 From 2f02dcb4ff3050f1e3af11efa3ed809405e996d8 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Tue, 8 Mar 2022 05:57:20 +0000 Subject: Update bonito SVN to 57 Bug: 223313197 Change-Id: Ic2ed06886679671a04a35f86665cb147b8103905 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index f686999a..3ac623a7 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=56 + ro.vendor.build.svn=57 # Vendor verbose logging default property ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) -- cgit v1.2.3 From 749e6717e6173272a8b06ce80e7b0ddad84022db Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 8 Mar 2022 13:53:47 -0800 Subject: Add new notice file build logic BUG: 223289891 Change-Id: I9cadc3074a51d47d3babc6fe63cf91bc79d4bf31 --- self-extractors/qcom/staging/Android.mk | 4 ++++ self-extractors_sargo/qcom/staging/Android.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/self-extractors/qcom/staging/Android.mk b/self-extractors/qcom/staging/Android.mk index 039e9118..a9a36782 100644 --- a/self-extractors/qcom/staging/Android.mk +++ b/self-extractors/qcom/staging/Android.mk @@ -1,5 +1,9 @@ LOCAL_PATH := $(call my-dir) +$(eval $(call declare-copy-files-license-metadata,vendor/qcom/bonito,:qcom,legacy_proprietary,proprietary,vendor/qcom/bonito/LICENSE,)) +$(eval $(call declare-copy-files-license-metadata,vendor/qcom/bonito,.jar,legacy_proprietary,proprietary,vendor/qcom/bonito/LICENSE,)) +$(eval $(call declare-copy-files-license-metadata,vendor/qcom/bonito,.xml,legacy_proprietary,proprietary,vendor/qcom/bonito/LICENSE,)) + ifneq ($(filter bonito, $(TARGET_DEVICE)),) include $(CLEAR_VARS) LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) diff --git a/self-extractors_sargo/qcom/staging/Android.mk b/self-extractors_sargo/qcom/staging/Android.mk index ce5244e0..e73075c6 100644 --- a/self-extractors_sargo/qcom/staging/Android.mk +++ b/self-extractors_sargo/qcom/staging/Android.mk @@ -1,5 +1,9 @@ LOCAL_PATH := $(call my-dir) +$(eval $(call declare-copy-files-license-metadata,vendor/qcom/sargo,:qcom,legacy_proprietary,proprietary,vendor/qcom/sargo/LICENSE,)) +$(eval $(call declare-copy-files-license-metadata,vendor/qcom/sargo,.jar,legacy_proprietary,proprietary,vendor/qcom/sargo/LICENSE,)) +$(eval $(call declare-copy-files-license-metadata,vendor/qcom/sargo,.xml,legacy_proprietary,proprietary,vendor/qcom/sargo/LICENSE,)) + ifneq ($(filter sargo, $(TARGET_DEVICE)),) include $(CLEAR_VARS) LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) -- cgit v1.2.3 From 5e8b4f052c07b767c0acb21541030a381e8939a7 Mon Sep 17 00:00:00 2001 From: shawnlin Date: Fri, 1 Apr 2022 16:45:09 +0800 Subject: Fixed status bar glitch for apps that access internal resource dimen Bring back old usage of status_bar_height, status_bar_height_portrait, and status_bar_height_landscape by set the size containing cutout size. Bug: 216782082 Test: make Change-Id: I8fc5916d6f6e57ebef538dc6ceee160d9c94b9ab --- bonito/overlay/frameworks/base/core/res/res/values/dimens.xml | 3 ++- sargo/overlay/frameworks/base/core/res/res/values/dimens.xml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) 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 @@ - 28dp + 28dp + 28dp 3px 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 @@ + 28dp 28dp -- cgit v1.2.3 From e7091e0b928be59cd4475014943e3745efda8740 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Fri, 8 Apr 2022 18:40:36 +0000 Subject: Update bonito SVN to 58 Bug: 228616782 Change-Id: I63bab0e7f4d2bd0b16531362ad25c09be2c89b8b --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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))) -- cgit v1.2.3