Snap for 8050040 from 9a36a9b438a764dbde28f6b90bd46acdddce918b to simpleperf-releasesimpleperf-release

Change-Id: Id724564b05e6078628eafc63ff6a2243f269d39f

11 files changed, 60 insertions, 48 deletions

diff --git a/blueline/BoardConfig.mk b/blueline/BoardConfig.mk
index b9908963..1736bc69 100644
--- a/blueline/BoardConfig.mk
+++ b/blueline/BoardConfig.mk
@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 
-ifdef PHONE_CAR_BOARD_CONFIG
-  include $(PHONE_CAR_BOARD_CONFIG)
+ifdef PHONE_CAR_BOARD_PRODUCT
+  include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
 else
   TARGET_BOOTLOADER_BOARD_NAME := blueline
   TARGET_SCREEN_DENSITY := 440
diff --git a/blueline/overlay/frameworks/base/core/res/res/values/config.xml b/blueline/overlay/frameworks/base/core/res/res/values/config.xml
index fed7d953..1686dda3 100755
--- a/blueline/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/blueline/overlay/frameworks/base/core/res/res/values/config.xml
@@ -689,19 +689,4 @@
         <item>G013B</item>
     </string-array>
 
-    <!-- Radius of the software rounded corners. -->
-    <dimen name="rounded_corner_radius">48px</dimen>
-
-    <!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
-    <dimen name="rounded_corner_radius_adjustment">0px</dimen>
-
-    <!-- Height of the status bar in portrait. The height should be
-         Max((status bar content height + waterfall top size), top cutout size) -->
-    <dimen name="status_bar_height_portrait">28dp</dimen>
-    <dimen name="status_bar_height_landscape">24dp</dimen>
-
-    <dimen name="quick_qs_offset_height">48dp</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>
 </resources>
diff --git a/blueline/overlay/frameworks/base/core/res/res/values/dimens.xml b/blueline/overlay/frameworks/base/core/res/res/values/dimens.xml
new file mode 100644
index 00000000..47123621
--- /dev/null
+++ b/blueline/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">48px</dimen>
+
+    <!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
+    <dimen name="rounded_corner_radius_adjustment">0px</dimen>
+
+    <!-- Height of the status bar in portrait. The height should be
+         Max((status bar content height + waterfall top size), top cutout size) -->
+    <dimen name="status_bar_height_portrait">28dp</dimen>
+    <dimen name="status_bar_height_landscape">24dp</dimen>
+
+    <dimen name="quick_qs_offset_height">28dp</dimen>
+</resources>
diff --git a/blueline/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/blueline/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index f5d26be5..ebfdcb1c 100644
--- a/blueline/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/blueline/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -21,6 +21,12 @@
     <!-- the padding on the top of the statusbar (usually 0) -->
     <dimen name="status_bar_padding_top">1px</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">450px</dimen>
 
diff --git a/crosshatch/BoardConfig.mk b/crosshatch/BoardConfig.mk
index 828afd92..de920964 100644
--- a/crosshatch/BoardConfig.mk
+++ b/crosshatch/BoardConfig.mk
@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 
-ifdef PHONE_CAR_BOARD_CONFIG
-  include $(PHONE_CAR_BOARD_CONFIG)
+ifdef PHONE_CAR_BOARD_PRODUCT
+  include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
 else
   TARGET_BOOTLOADER_BOARD_NAME := crosshatch
   TARGET_SCREEN_DENSITY := 560
diff --git a/crosshatch/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/crosshatch/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 1d98cf9c..c0fe31bb 100644
--- a/crosshatch/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/crosshatch/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -21,13 +21,16 @@
     <dimen name="display_cutout_margin_consumption">0px</dimen>
 
     <!-- Height of the status bar header bar when on Keyguard (match status_bar_portrait) -->
-    <dimen name="status_bar_header_height_keyguard">49dp</dimen>
+    <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>
 
     <!-- Margin end of the system icons super container when the avatar is missing. -->
     <dimen name="system_icons_super_container_avatarless_margin_end">10dp</dimen>
 
     <!-- end margin for multi user switch in collapsed quick settings -->
-    <dimen name="multi_user_switch_keyguard_margin">7dp</dimen>
+    <dimen name="multi_user_switch_keyguard_margin">9dp</dimen>
 
     <!-- Location on the screen of the center of the physical power button. -->
     <dimen name="physical_power_button_center_screen_location_y">780px</dimen>
diff --git a/manifest.xml b/manifest.xml
index 5954f56b..627b5a16 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/self-extractors/root/proprietary/BoardConfigVendor.mk b/self-extractors/root/proprietary/BoardConfigVendor.mk
index 088de0f0..4e5d82a1 100644
--- a/self-extractors/root/proprietary/BoardConfigVendor.mk
+++ b/self-extractors/root/proprietary/BoardConfigVendor.mk
@@ -13,10 +13,9 @@
 # limitations under the License.
 
 ifneq ($(filter blueline,$(TARGET_DEVICE)),)
-LOCAL_STEM := blueline/BoardConfigPartial.mk
+-include vendor/google_devices/blueline/BoardConfigPartial.mk
+-include vendor/qcom/blueline/BoardConfigPartial.mk
 else
-LOCAL_STEM := crosshatch/BoardConfigPartial.mk
+-include vendor/google_devices/crosshatch/BoardConfigPartial.mk
+-include vendor/qcom/crosshatch/BoardConfigPartial.mk
 endif
-
--include vendor/google_devices/$(LOCAL_STEM)
--include vendor/qcom/$(LOCAL_STEM)
diff --git a/self-extractors/root/proprietary/device-vendor.mk b/self-extractors/root/proprietary/device-vendor.mk
index f6c5130d..6a95aa64 100644
--- a/self-extractors/root/proprietary/device-vendor.mk
+++ b/self-extractors/root/proprietary/device-vendor.mk
@@ -12,7 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-LOCAL_STEM := crosshatch/device-partial.mk
-
-$(call inherit-product-if-exists, vendor/google_devices/$(LOCAL_STEM))
-$(call inherit-product-if-exists, vendor/qcom/$(LOCAL_STEM))
+$(call inherit-product-if-exists, vendor/google_devices/crosshatch/device-partial.mk)
+$(call inherit-product-if-exists, vendor/qcom/crosshatch/device-partial.mk)
diff --git a/self-extractors_blueline/root/proprietary/BoardConfigVendor.mk b/self-extractors_blueline/root/proprietary/BoardConfigVendor.mk
index 088de0f0..4e5d82a1 100644
--- a/self-extractors_blueline/root/proprietary/BoardConfigVendor.mk
+++ b/self-extractors_blueline/root/proprietary/BoardConfigVendor.mk
@@ -13,10 +13,9 @@
 # limitations under the License.
 
 ifneq ($(filter blueline,$(TARGET_DEVICE)),)
-LOCAL_STEM := blueline/BoardConfigPartial.mk
+-include vendor/google_devices/blueline/BoardConfigPartial.mk
+-include vendor/qcom/blueline/BoardConfigPartial.mk
 else
-LOCAL_STEM := crosshatch/BoardConfigPartial.mk
+-include vendor/google_devices/crosshatch/BoardConfigPartial.mk
+-include vendor/qcom/crosshatch/BoardConfigPartial.mk
 endif
-
--include vendor/google_devices/$(LOCAL_STEM)
--include vendor/qcom/$(LOCAL_STEM)
diff --git a/self-extractors_blueline/root/proprietary/device-vendor.mk b/self-extractors_blueline/root/proprietary/device-vendor.mk
index 852ea5ec..23d7f0ba 100644
--- a/self-extractors_blueline/root/proprietary/device-vendor.mk
+++ b/self-extractors_blueline/root/proprietary/device-vendor.mk
@@ -12,7 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-LOCAL_STEM := blueline/device-partial.mk
-
-$(call inherit-product-if-exists, vendor/google_devices/$(LOCAL_STEM))
-$(call inherit-product-if-exists, vendor/qcom/$(LOCAL_STEM))
+$(call inherit-product-if-exists, vendor/google_devices/blueline/device-partial.mk)
+$(call inherit-product-if-exists, vendor/qcom/blueline/device-partial.mk)