From be0d2baf7aa0f3b5a75d5221987fd8a4856f6548 Mon Sep 17 00:00:00 2001
From: Grace Cheng <graciecheng@google.com>
Date: Wed, 8 Jun 2022 23:12:14 +0000
Subject: [PATCH 1/4] Adjust lock icon padding for visual match on C10/P10

Adjust lock icon padding for visual match on C10/P10

Bug: 219895641
Test: Visual comparison of alignment using layout inspector
Change-Id: Iffb6fb6344a29c5cc217f1ff4897790a784e6829
---
 .../frameworks/base/packages/SystemUI/res/values/dimens.xml     | 2 +-
 .../frameworks/base/packages/SystemUI/res/values/dimens.xml     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 7027f07..4ce1f63 100644
--- a/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -43,7 +43,7 @@
     <dimen name="physical_volume_down_button_center_screen_location_y">1520px</dimen>
 
     <!-- Padding for the lock icon on the keyguard. In pixels - should not scale with display size. -->
-    <dimen name="lock_icon_padding">68px</dimen>
+    <dimen name="lock_icon_padding">60px</dimen>
 
     <!-- Alpha in duration in ms for the auth ripple to become fully vislble. If set to 0, it is immediately visible. -->
     <integer name="auth_ripple_alpha_in_duration">0</integer>
diff --git a/panther/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/panther/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 992a8f6..8d40b1d 100644
--- a/panther/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/panther/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -46,5 +46,7 @@
     <dimen name="physical_volume_up_button_center_screen_location_y">950px</dimen>
     <dimen name="physical_volume_down_button_center_screen_location_y">1110px</dimen>
 
+    <!-- Padding for the lock icon on the keyguard. In pixels - should not scale with display size. -->
+    <dimen name="lock_icon_padding">48px</dimen>
   </resources>
 

From d1335270f38aaee23b43c1ee9421d4e09c14b74c Mon Sep 17 00:00:00 2001
From: linpeter <linpeter@google.com>
Date: Wed, 25 May 2022 18:18:17 +0800
Subject: [PATCH 2/4] display: blocking zone update and hbm sunlight refresh
 rate

zone1 condition(10 nits) in 90Hz
zone2 condition(15 nits, 10 Lux) in 90Hz

Sunlight high brightness mode in 90Hz

Bug: 222637975
Test: check dumpsys
Change-Id: I1c4b3f90d9513f587921c7360b3e257b32b166e8
---
 .../frameworks/base/core/res/res/values/config.xml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/panther/overlay/frameworks/base/core/res/res/values/config.xml b/panther/overlay/frameworks/base/core/res/res/values/config.xml
index 1605b88..b1691c1 100644
--- a/panther/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/panther/overlay/frameworks/base/core/res/res/values/config.xml
@@ -69,14 +69,14 @@
     <!-- Not allow to switch to higher refresh rate when display brightness setting is
          equal or less than this value -->
     <integer-array name="config_brightnessThresholdsOfPeakRefreshRate">
-        <!-- System brightness for 20 nits: round((20-2)/(1000-2)*(255-1)+1) = 6 -->
-        <item>6</item> <!-- 34% UI brightness -->
-        <!-- System brightness for 25 nits: round((25-2)/(1000-2)*(255-1)+1) = 7 -->
-        <item>7</item> <!-- 38% UI brightness -->
+        <!-- System brightness for 10 nits: round((10-2)/(1000-2)*(255-1)+1) = 3 -->
+        <item>3</item> <!-- 20% UI brightness -->
+        <!-- System brightness for 15 nits: round((15-2)/(1000-2)*(255-1)+1) = 4 -->
+        <item>4</item> <!-- 24% UI brightness -->
     </integer-array>
     <integer-array name="config_ambientThresholdsOfPeakRefreshRate">
         <item>-1</item>
-        <item>20</item>
+        <item>10</item>
     </integer-array>
     <!-- default refresh rate in the zone defined by birghtness and ambient thresholds -->
     <integer name="config_defaultRefreshRateInZone">90</integer>
@@ -95,6 +95,10 @@
     <!-- default refresh rate in the high zone defined by birghtness and ambient thresholds -->
     <integer name="config_fixedRefreshRateInHighZone">60</integer>
 
+    <!-- Default refresh rate while the device has high brightness mode enabled for Sunlight.
+         This value overrides values from DisplayDeviceConfig -->
+    <integer name="config_defaultRefreshRateInHbmSunlight">90</integer>
+
     <!-- Default refresh rate while the device has high brightness mode enabled for HDR. -->
     <integer name="config_defaultRefreshRateInHbmHdr">60</integer>
 

From 71da37e6aa36842cc0a983551d3d4459cfa8b1c4 Mon Sep 17 00:00:00 2001
From: George Chang <georgekgchang@google.com>
Date: Thu, 9 Jun 2022 11:07:21 +0800
Subject: [PATCH 3/4] Remove SEReset everytime at boot

Using NFC FW SEReset at every power off

Bug: 229736863
Bug: 228642009
Test: manual
Change-Id: I036a79d628c5302e3dae57f2f587c09b16933fde
---
 conf/init.pantah.rc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/conf/init.pantah.rc b/conf/init.pantah.rc
index 6ddf9cd..2b1408d 100644
--- a/conf/init.pantah.rc
+++ b/conf/init.pantah.rc
@@ -71,9 +71,6 @@ on property:ro.boot.hardware.revision=PROTO1.0
 on property:ro.boot.hardware.revision=PROTO1.1
     setprop persist.vendor.nfc.config_file_name libnfc-hal-st-proto1.conf
 
-on post-fs-data
-    setprop persist.vendor.se.reset reset
-
 # Bluetooth
 on post-fs-data
     chown bluetooth system /proc/bluetooth/timesync

From d4b1faecc3156e583c9872fbce2b932aaa8c50f5 Mon Sep 17 00:00:00 2001
From: Devika Krishnadas <kdevika@google.com>
Date: Tue, 7 Jun 2022 23:20:37 +0000
Subject: [PATCH 4/4] Boost GPU for app launch

Bug: 228562770
Bug: 235424392
Test: App launch and see if we scale up
Signed-off-by: Devika Krishnadas <kdevika@google.com>
Change-Id: I801f08a9c4019e1449ead0826413c1400a55b164
---
 powerhint-cheetah.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json
index 8c98fa6..c603918 100644
--- a/powerhint-cheetah.json
+++ b/powerhint-cheetah.json
@@ -536,6 +536,12 @@
       "Duration": 5000,
       "Value": "0"
     },
+    {
+      "PowerHint": "LAUNCH_120FPS",
+      "Node": "GPUMinFreq",
+      "Duration": 1000,
+      "Value": "848000"
+    },
     {
       "PowerHint": "LAUNCH_120FPS",
       "Node": "SFUClampBoost",