From 0fa9df0df6b1846cc8d5c7e6195e54d6bd8731a5 Mon Sep 17 00:00:00 2001
From: Bill Lin <lbill@google.com>
Date: Tue, 17 Aug 2021 15:16:55 +0800
Subject: Customize Bonito/Sargo status bar system icons padding

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

Test: atest SystemUITests
Test: manual review visual
Bug: 195670442
Fixes: 198252802
Change-Id: I49810a58eeac65c0fa5c7f69f7465e44220fb00d
Merged-In: I49810a58eeac65c0fa5c7f69f7465e44220fb00d
---
 .../frameworks/base/core/res/res/values/config.xml |  5 ----
 .../frameworks/base/core/res/res/values/dimens.xml | 33 ++++++++++++++++++++++
 .../base/packages/SystemUI/res/values/dimens.xml   |  8 ++++--
 .../frameworks/base/core/res/res/values/config.xml |  6 ----
 .../frameworks/base/core/res/res/values/dimens.xml | 33 ++++++++++++++++++++++
 .../base/packages/SystemUI/res/values/dimens.xml   |  8 ++++--
 6 files changed, 78 insertions(+), 15 deletions(-)
 create mode 100644 bonito/overlay/frameworks/base/core/res/res/values/dimens.xml
 create mode 100644 sargo/overlay/frameworks/base/core/res/res/values/dimens.xml

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


From d3d1e7022128f83363d738e16d2122647c6dd849 Mon Sep 17 00:00:00 2001
From: Paul Scovanner <pscovanner@google.com>
Date: Mon, 13 Sep 2021 22:25:28 +0000
Subject: Update Bonito SVN to 49

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

diff --git a/device.mk b/device.mk
index a70f34a7..0aa30237 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=47
+	ro.vendor.build.svn=49
 
 # Vendor verbose logging default property
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-- 
cgit v1.2.3


From d87b64e9525d40bdca1abd06fbace6a6b539729b Mon Sep 17 00:00:00 2001
From: Neha Jain <jainne@google.com>
Date: Wed, 22 Sep 2021 23:30:15 +0000
Subject: Update B4/S4 SVN to 50

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

diff --git a/device.mk b/device.mk
index 0aa30237..81cccf37 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=49
+	ro.vendor.build.svn=50
 
 # Vendor verbose logging default property
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-- 
cgit v1.2.3