From 11b2105e40ec1113231252ccc61cb22a1feec41b Mon Sep 17 00:00:00 2001
From: Paul Scovanner <pscovanner@google.com>
Date: Fri, 13 Aug 2021 20:07:09 +0000
Subject: Update Crosshatch SVN to 55

Bug: 193547118
Change-Id: Ibaa11d34fdedb22edf535c458ae57adbbfff7e65
Merged-In: I9f6826af6de5e8501b9641dc5f6fd635b8611477
---
 device.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device.mk b/device.mk
index f36d8295..85030167 100644
--- a/device.mk
+++ b/device.mk
@@ -841,7 +841,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.vendor.build.svn=54
+    ro.vendor.build.svn=55
 
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.adb.secure=1
-- 
cgit v1.2.3


From c363791f1a818dcfe69c8535873032ab344896ae Mon Sep 17 00:00:00 2001
From: Paul Scovanner <pscovanner@google.com>
Date: Wed, 25 Aug 2021 23:18:24 +0000
Subject: Update Crosshatch SVN to 58

Bug: 193547118
Change-Id: I4991e685c3af650fa0c12051b763adff44cd9453
---
 device.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device.mk b/device.mk
index dba268e1..f7b85aff 100644
--- a/device.mk
+++ b/device.mk
@@ -849,7 +849,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.vendor.build.svn=57
+    ro.vendor.build.svn=58
 
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.adb.secure=1
-- 
cgit v1.2.3


From bd110819a562652a98b0fba16f3334fed7d751ef Mon Sep 17 00:00:00 2001
From: Bill Lin <lbill@google.com>
Date: Tue, 17 Aug 2021 16:00:01 +0800
Subject: Customize Crosshatch/Blueline status bar system icons padding

1. Move dimen res from config.xml to dimens.xml
2. Adjust the padding system_icons_keyguard_padding_end

Test: atest SystemUITests
Test: manual review visual
Bug: 195670442
Fixes: 198252802
Change-Id: I65ef9a83b209e07aa583e42c6e6bdcb994a029ce
Merged-In: I65ef9a83b209e07aa583e42c6e6bdcb994a029ce
---
 .../frameworks/base/core/res/res/values/config.xml | 15 ----------
 .../frameworks/base/core/res/res/values/dimens.xml | 33 ++++++++++++++++++++++
 .../base/packages/SystemUI/res/values/dimens.xml   |  6 ++++
 .../base/packages/SystemUI/res/values/dimens.xml   |  7 +++--
 4 files changed, 44 insertions(+), 17 deletions(-)
 create mode 100644 blueline/overlay/frameworks/base/core/res/res/values/dimens.xml

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/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>
-- 
cgit v1.2.3


From 2660db585ee3b43c3c8a54e302adfc57577c07b3 Mon Sep 17 00:00:00 2001
From: Neha Jain <jainne@google.com>
Date: Wed, 1 Sep 2021 19:45:54 +0000
Subject: Update Crosshatch SVN to 59

Bug: 198443012
Change-Id: I050eb7410634347c04042b0809eb5fc13c822aab
---
 device.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device.mk b/device.mk
index f7b85aff..15b65e70 100644
--- a/device.mk
+++ b/device.mk
@@ -849,7 +849,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.vendor.build.svn=58
+    ro.vendor.build.svn=59
 
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.adb.secure=1
-- 
cgit v1.2.3


From 6c8e74da135ada2d277b8a12f757533c5c92b6c8 Mon Sep 17 00:00:00 2001
From: ichihlu <ichihlu@google.com>
Date: Wed, 1 Sep 2021 00:18:38 +0000
Subject: Use vintf for confirmation UI

Bug: 198291202
Test: Build pass
Change-Id: I52e1c08f1ac10952ecaab387b2469554a45e5aef
(cherry picked from commit c4110d7ccf2fc87b97d7fa61230379075f8c6285)
---
 manifest.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index 5954f56b..627b5a16 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -80,15 +80,6 @@
             <instance>default</instance>
         </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>
-- 
cgit v1.2.3


From bf902efda1fbf8e3fd6d22b068be2dbea9e95907 Mon Sep 17 00:00:00 2001
From: Bill Lin <lbill@google.com>
Date: Tue, 17 Aug 2021 16:00:01 +0800
Subject: Customize Crosshatch/Blueline status bar system icons padding

Auto merger flow:
sc-qpr1-dev > sc-qpr1-dev-plus-aosp > sc-v2-dev-plus-aosp > master

This CL CP from sc-qpr1-dev to avoid sc-*-dev-plus-aosp conflict

1. Move dimen res from config.xml to dimens.xml
2. Adjust the padding system_icons_keyguard_padding_end

Test: atest SystemUITests
Test: manual review visual
Bug: 195670442
Fixes: 198252802
Change-Id: I65ef9a83b209e07aa583e42c6e6bdcb994a029ce
Merged-In: I65ef9a83b209e07aa583e42c6e6bdcb994a029ce
---
 .../frameworks/base/core/res/res/values/config.xml | 15 ----------
 .../frameworks/base/core/res/res/values/dimens.xml | 33 ++++++++++++++++++++++
 .../base/packages/SystemUI/res/values/dimens.xml   |  6 ++++
 .../base/packages/SystemUI/res/values/dimens.xml   |  7 +++--
 4 files changed, 44 insertions(+), 17 deletions(-)
 create mode 100644 blueline/overlay/frameworks/base/core/res/res/values/dimens.xml

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/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>
-- 
cgit v1.2.3


From 9a36a9b438a764dbde28f6b90bd46acdddce918b Mon Sep 17 00:00:00 2001
From: Cole Faust <colefaust@google.com>
Date: Tue, 21 Dec 2021 11:43:54 -0800
Subject: Inline usages of LOCAL_STEM

Having no variables in include/inherit-product statements
makes the conversion to starlark cleaner.

Bug: 211659921
Test: Presubmits
Change-Id: I9855bf74876f1895429fb5e5c173f619d29c74aa
---
 self-extractors/root/proprietary/BoardConfigVendor.mk          | 9 ++++-----
 self-extractors/root/proprietary/device-vendor.mk              | 6 ++----
 self-extractors_blueline/root/proprietary/BoardConfigVendor.mk | 9 ++++-----
 self-extractors_blueline/root/proprietary/device-vendor.mk     | 6 ++----
 4 files changed, 12 insertions(+), 18 deletions(-)

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)
-- 
cgit v1.2.3