diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-01-13 02:00:51 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-01-13 02:00:51 +0000 |
commit | 72e832d1b9aed4018da0acaa6b74ff8a644f1a6e (patch) | |
tree | 118f12354c923579cfdbdb8098d9c451189df7d2 | |
parent | 2762361ff94a975419ee11d6a3abd628c346a1f0 (diff) | |
parent | e47fba861df3bc10cdade97e68214a1a747cb86a (diff) | |
download | bonito-72e832d1b9aed4018da0acaa6b74ff8a644f1a6e.tar.gz |
Snap for 8074123 from e47fba861df3bc10cdade97e68214a1a747cb86a to sdk-release
Change-Id: I167962e9d1307e2e37a47208e36badc4c53547a1
8 files changed, 79 insertions, 25 deletions
diff --git a/bonito/overlay/frameworks/base/core/res/res/values/config.xml b/bonito/overlay/frameworks/base/core/res/res/values/config.xml index 36244cf2..66fddfc1 100755 --- a/bonito/overlay/frameworks/base/core/res/res/values/config.xml +++ b/bonito/overlay/frameworks/base/core/res/res/values/config.xml @@ -698,9 +698,4 @@ <item>G020D</item> </string-array> - <!-- Radius of the software rounded corners. --> - <dimen name="rounded_corner_radius">39px</dimen> - <dimen name="rounded_corner_radius_top">38px</dimen> - <dimen name="rounded_corner_radius_bottom">39px</dimen> - </resources> diff --git a/bonito/overlay/frameworks/base/core/res/res/values/dimens.xml b/bonito/overlay/frameworks/base/core/res/res/values/dimens.xml new file mode 100644 index 00000000..0a7c4e5b --- /dev/null +++ b/bonito/overlay/frameworks/base/core/res/res/values/dimens.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2021, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Radius of the software rounded corners. --> + <dimen name="rounded_corner_radius">39px</dimen> + <dimen name="rounded_corner_radius_top">38px</dimen> + <dimen name="rounded_corner_radius_bottom">39px</dimen> + + <!-- Height of the status bar --> + <dimen name="status_bar_height_portrait">28dp</dimen> + <!-- Height of area above QQS where battery/time go (equal to status bar) --> + <dimen name="quick_qs_offset_height">28dp</dimen> + + <!-- Adjustment for software rounded corners since corners aren't perfectly round. --> + <dimen name="rounded_corner_radius_adjustment">3px</dimen> +</resources> diff --git a/bonito/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/bonito/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index 34a55277..8295f934 100644 --- a/bonito/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/bonito/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -17,8 +17,12 @@ --> <resources> <dimen name="rounded_corner_content_padding">28px</dimen> - <!-- Height of the status bar --> - <dimen name="status_bar_height_portrait">28dp</dimen> + + <!-- Height of the status bar header bar when on Keyguard (match status_bar_portrait) --> + <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height_portrait</dimen> + + <!-- Margin on the right side of the system icon group on Keyguard. --> + <dimen name="system_icons_keyguard_padding_end">8.5dp</dimen> <!-- Location on the screen of the center of the physical power button. --> <dimen name="physical_power_button_center_screen_location_y">500px</dimen> @@ -879,7 +879,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.build.svn=50 + ro.vendor.build.svn=53 # Vendor verbose logging default property ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) diff --git a/manifest.xml b/manifest.xml index 40820485..0f78cf0e 100644 --- a/manifest.xml +++ b/manifest.xml @@ -81,15 +81,6 @@ </interface> </hal> <hal format="hidl"> - <name>android.hardware.confirmationui</name> - <transport>hwbinder</transport> - <version>1.0</version> - <interface> - <name>IConfirmationUI</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> <name>android.hardware.drm</name> <transport>hwbinder</transport> <version>1.0</version> diff --git a/sargo/overlay/frameworks/base/core/res/res/values/config.xml b/sargo/overlay/frameworks/base/core/res/res/values/config.xml index dc0b0ecd..5c67555c 100755 --- a/sargo/overlay/frameworks/base/core/res/res/values/config.xml +++ b/sargo/overlay/frameworks/base/core/res/res/values/config.xml @@ -698,10 +698,4 @@ <string-array name="config_disableApkUnlessMatchedSku_skus_list" translatable="false"> <item>G020H</item> </string-array> - - <!-- Radius of the software rounded corners. --> - <dimen name="rounded_corner_radius">39px</dimen> - <dimen name="rounded_corner_radius_top">40px</dimen> - <dimen name="rounded_corner_radius_bottom">41px</dimen> - </resources> diff --git a/sargo/overlay/frameworks/base/core/res/res/values/dimens.xml b/sargo/overlay/frameworks/base/core/res/res/values/dimens.xml new file mode 100644 index 00000000..0a7c4e5b --- /dev/null +++ b/sargo/overlay/frameworks/base/core/res/res/values/dimens.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2021, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Radius of the software rounded corners. --> + <dimen name="rounded_corner_radius">39px</dimen> + <dimen name="rounded_corner_radius_top">38px</dimen> + <dimen name="rounded_corner_radius_bottom">39px</dimen> + + <!-- Height of the status bar --> + <dimen name="status_bar_height_portrait">28dp</dimen> + <!-- Height of area above QQS where battery/time go (equal to status bar) --> + <dimen name="quick_qs_offset_height">28dp</dimen> + + <!-- Adjustment for software rounded corners since corners aren't perfectly round. --> + <dimen name="rounded_corner_radius_adjustment">3px</dimen> +</resources> diff --git a/sargo/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/sargo/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index ef68a5ad..01c0d468 100644 --- a/sargo/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/sargo/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -17,8 +17,12 @@ --> <resources> <dimen name="rounded_corner_content_padding">28px</dimen> - <!-- Height of the status bar --> - <dimen name="status_bar_height_portrait">28dp</dimen> + + <!-- Height of the status bar header bar when on Keyguard (match status_bar_portrait) --> + <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height_portrait</dimen> + + <!-- Margin on the right side of the system icon group on Keyguard. --> + <dimen name="system_icons_keyguard_padding_end">9dp</dimen> <!-- Location on the screen of the center of the physical power button. --> <dimen name="physical_power_button_center_screen_location_y">530px</dimen> |