From c2e47893cba62624b20193bbe5ba67592f37e80f Mon Sep 17 00:00:00 2001
From: jonerlin <jonerlin@google.com>
Date: Fri, 6 Aug 2021 16:04:23 +0800
Subject: [PATCH 1/2] power_profile: add bluetooth power data

Bug: 195157251
Test: manual
Change-Id: I2de092b8a244d2b6e4debe4ab5590c4a6f7bf930
---
 .../frameworks/base/core/res/res/xml/power_profile.xml   | 9 +++++++++
 .../frameworks/base/core/res/res/xml/power_profile.xml   | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/oriole/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/oriole/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index c95c57f..0e8589e 100644
--- a/oriole/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -185,5 +185,14 @@
     <item name="wifi.controller.tx">470</item>
     <!-- Operating voltage for wifi radio in mV.-->
     <item name="wifi.controller.voltage">3700</item>
+
+    <!-- Idle current for bluetooth in mA.-->
+    <item name="bluetooth.controller.idle">2.2</item>
+    <!-- Rx current for bluetooth in mA.-->
+    <item name="bluetooth.controller.rx">5.8</item>
+    <!-- Tx current for bluetooth in mA-->
+    <item name="bluetooth.controller.tx">20</item>
+    <!-- Operating voltage for bluetooth in mV.-->
+    <item name="bluetooth.controller.voltage">3850</item>
 </device>
 
diff --git a/raven/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/raven/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index a7cec2d..5273eb6 100644
--- a/raven/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/raven/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -185,5 +185,14 @@
     <item name="wifi.controller.tx">470</item>
     <!-- Operating voltage for wifi radio in mV.-->
     <item name="wifi.controller.voltage">3700</item>
+
+    <!-- Idle current for bluetooth in mA.-->
+    <item name="bluetooth.controller.idle">2.2</item>
+    <!-- Rx current for bluetooth in mA.-->
+    <item name="bluetooth.controller.rx">5.8</item>
+    <!-- Tx current for bluetooth in mA-->
+    <item name="bluetooth.controller.tx">20</item>
+    <!-- Operating voltage for bluetooth in mV.-->
+    <item name="bluetooth.controller.voltage">3850</item>
 </device>
 

From 73e2784392bea3c520d607e1eb0e46094fde8848 Mon Sep 17 00:00:00 2001
From: Bill Lin <lbill@google.com>
Date: Sat, 7 Aug 2021 03:39:45 +0800
Subject: [PATCH 2/2] Fix system icons container x-axis shift between
 Keyguard/Home StatusBar

Adjust the system_icons_keyguard_padding_end for O6/R4

Consider below scenario:
1. Enable/Disable multi-user: This case must have x-asix shift due to
   home StatusBar did not designed to show avator icon
2. Keyguard/Home StatusBar alignment
3. w/ & w/o privacy dot
4. w/ & w/o plug-in USB cable
5. w/ & w/o show battery percentage

Test: build and check the visual
Bug: 195670442
Change-Id: I783c026e46d7cc01839a4e56fed9fdb89ca6b194
---
 .../frameworks/base/packages/SystemUI/res/values/dimens.xml     | 2 +-
 .../frameworks/base/packages/SystemUI/res/values/dimens.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index cfe1140..5b1dcd2 100644
--- a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -34,7 +34,7 @@
     <dimen name="system_icons_super_container_avatarless_margin_end">26px</dimen>
 
     <!-- Margin on the right side of the system icon group on Keyguard. -->
-    <dimen name="system_icons_keyguard_padding_end">6dp</dimen>
+    <dimen name="system_icons_keyguard_padding_end">5dp</dimen>
 
     <dimen name="keyguard_carrier_text_margin">0px</dimen>
 
diff --git a/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 287e3de..a3a5a31 100644
--- a/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -31,7 +31,7 @@
     <dimen name="system_icons_super_container_avatarless_margin_end">26px</dimen>
 
     <!-- Margin on the right side of the system icon group on Keyguard. -->
-    <dimen name="system_icons_keyguard_padding_end">10dp</dimen>
+    <dimen name="system_icons_keyguard_padding_end">7dp</dimen>
 
     <!-- A path similar to frameworks/base/core/res/res/values/config.xml
         config_mainBuiltInDisplayCutout that describes a path larger than the exact path of a display