From 4170cfe2c40b83b782f821d629ca8203a38f8114 Mon Sep 17 00:00:00 2001
From: Chris Paulo <chrispaulo@google.com>
Date: Mon, 18 Mar 2024 16:57:45 -0700
Subject: [PATCH 1/5] vibrator: Enable adaptive haptics v1

Bug: 325554350
Test: atest SettingsGoogleRoboTests:com.google.android.settings.accessibility.AdaptiveHapticsTogglePreferenceControllerTest
Change-Id: I4604872786f177a6d307d9fdc24bfe8149ae081a
Signed-off-by: Chris Paulo <chrispaulo@google.com>
---
 device-comet.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/device-comet.mk b/device-comet.mk
index d44d4b7..4b9f3c6 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -328,13 +328,19 @@ PRODUCT_VENDOR_PROPERTIES += \
 # remove pm.activetimeout
 # ro.vendor.vibrator.hal.loc.coeff.folded currently unused
 ACTUATOR_MODEL := luxshare_ict_081545
+ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1
 PRODUCT_VENDOR_PROPERTIES += \
     ro.vendor.vibrator.hal.chirp.enabled=1 \
     ro.vendor.vibrator.hal.device.mass=0.2605 \
     ro.vendor.vibrator.hal.loc.coeff.folded=3.15 \
     ro.vendor.vibrator.hal.loc.coeff=2.58 \
     ro.vendor.vibrator.hal.dbc.enable=1 \
-    ro.vendor.vibrator.hal.pm.activetimeout=5
+    ro.vendor.vibrator.hal.pm.activetimeout=5 \
+    persist.vendor.vibrator.hal.context.enable=false \
+    persist.vendor.vibrator.hal.context.scale=60 \
+    persist.vendor.vibrator.hal.context.fade=true \
+    persist.vendor.vibrator.hal.context.cooldowntime=1600 \
+    persist.vendor.vibrator.hal.context.settlingtime=5000
 
 # Hinge angle sensor
 PRODUCT_COPY_FILES += \

From 8cc26bba4ba0839f8feffa4231ef2275e09bbe32 Mon Sep 17 00:00:00 2001
From: Kimi Hsu <kimih@google.com>
Date: Tue, 19 Mar 2024 07:33:20 +0000
Subject: [PATCH 2/5] Use rounded corner radius from max resolution

Bug: 330088446
Test: try WindowInsets#getRoundedCorner
Flag: NONE
Change-Id: If449421cd1936924e45ae23ccd031661ce3a7fe9
---
 .../frameworks/base/core/res/res/values/config.xml        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/comet/overlay/frameworks/base/core/res/res/values/config.xml b/comet/overlay/frameworks/base/core/res/res/values/config.xml
index 2aa58e4..4b1a78f 100644
--- a/comet/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/comet/overlay/frameworks/base/core/res/res/values/config.xml
@@ -238,15 +238,15 @@
 
     <!-- Radius of the software rounded corners at the top of primary display in its natural
         orientation. If zero, the value of rounded_corner_radius is used. -->
-    <dimen name="rounded_corner_radius_top">52px</dimen>
+    <dimen name="rounded_corner_radius_top">85px</dimen>
     <!-- For secondary display -->
-    <dimen name="secondary_rounded_corner_radius_top">91px</dimen>
+    <dimen name="secondary_rounded_corner_radius_top">115px</dimen>
 
     <!-- Radius of the software rounded corners at the bottom of primary display in its natural
         orientation. If zero, the value of rounded_corner_radius is used. -->
-    <dimen name="rounded_corner_radius_bottom">48px</dimen>
+    <dimen name="rounded_corner_radius_bottom">85px</dimen>
     <!-- For secondary display -->
-    <dimen name="secondary_rounded_corner_radius_bottom">91px</dimen>
+    <dimen name="secondary_rounded_corner_radius_bottom">115px</dimen>
 
     <!-- A string config in svg path format for the main display shape.
          (@see https://www.w3.org/TR/SVG/paths.html#PathData).

From c7cfb7002b89a166a244d3b6372ec221d8606fc5 Mon Sep 17 00:00:00 2001
From: samou <samou@google.com>
Date: Tue, 30 Jan 2024 06:31:06 +0000
Subject: [PATCH 3/5] audio: enable battery mitigation

Bug: 330302105
Test: manual test
Change-Id: Id042e4c0d7f69d38b41a39d131e77f5b96c23c68
Signed-off-by: samou <samou@google.com>
---
 audio/comet/aidl_config/audio_platform_configuration.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/audio/comet/aidl_config/audio_platform_configuration.xml b/audio/comet/aidl_config/audio_platform_configuration.xml
index 8133645..3604324 100644
--- a/audio/comet/aidl_config/audio_platform_configuration.xml
+++ b/audio/comet/aidl_config/audio_platform_configuration.xml
@@ -20,6 +20,12 @@
       <argument name="Name" value="BCL_AUDIO_BAACL" />
       <argument name="Strategy" value="MediaSpeakerAndScreenOn" />
     </feature>
+    <feature name="BatteryMitigation">
+      <argument name="TargetDigitalVolume" value="809" />
+      <argument name="PcmRampMs" value="15ms" />
+      <argument name="ThrottleDurationMs" value="3000" />
+      <argument name="ThrottleMitigationLevel" value="LIGHT" />
+    </feature>
     <feature name="PlaybackThermalThrottle">
       <argument name="PollWaitMs" value="20000" />
       <argument name="ThermistorName" value="VIRTUAL-SKIN-SPEAKER" />

From d7dfd21b5ccad67363def65b01e940d39e2f5c58 Mon Sep 17 00:00:00 2001
From: Isaac Chiou <isaacchiou@google.com>
Date: Tue, 19 Mar 2024 16:20:59 +0800
Subject: [PATCH 4/5] wifi: disable FW roaming when in idle mode

When device is idle, disable FW roaming (LOW RSSI roam, high band roam) to save power

Bug: 321639511
Test: Manual
Test: Build pass
Change-Id: I4426483eb9da7810e8dc3343680ff83f524e9b26
---
 rro_overlays/WifiOverlay/res/values/config.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index 298d12d..96d623a 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -187,4 +187,10 @@
          If equals to 0, it means there's no limit on the max number of channels to include per network.-->
     <integer translatable="false" name="config_wifiInitialPartialScanMaxNewChannelsPerNetwork">3</integer>
 
+    <!-- Boolean indicating whether to disable firmware roaming when the device goes into idle mode.
+         true: firmware roaming will be disabled when the device goes into idle mode, and then
+               re-activated when the device exits idle mode.
+         false: firmware roaming will not be affected. -->
+    <bool translatable="false" name ="config_wifiDisableFirmwareRoamingInIdleMode">true</bool>
+
 </resources>

From 5268d19872d599f9abb90afbc178c285babd0fd2 Mon Sep 17 00:00:00 2001
From: William Huang <yushh@google.com>
Date: Mon, 18 Mar 2024 04:09:28 +0000
Subject: [PATCH 5/5] Spatializer: Update configs with latest tunings.

Update Auxel configs to http://go/txcl/34322 (commit 974de25dbcc96ce834d251e55c28463c91082f03).

Bug: 307842941
Change-Id: I09568cb3e661bd23cde0fe8adf419ab4f7040b97
Signed-off-by: William Huang <yushh@google.com>
---
 audio/comet/tuning/spatializer/base | Bin 3336 -> 3448 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/audio/comet/tuning/spatializer/base b/audio/comet/tuning/spatializer/base
index 7d6a7bb07557e8680db7bb6548f6ff58352fbf48..85771ce217fc74aa5cd5707f936185742b514a22 100644
GIT binary patch
delta 747
zcmaiyze)o^5XNWs{^V|RN$zq9iP6NUoghAd2uT|R(J~-tYa!T)jo65V7RPj=g}qHk
zEhN279zck1Ale8bI5UZfNWfxe?>FCkx4W}@S^20$5defVG$??TwXR8`ZKr2ZCTYgW
zNuYaHa?x7m440N^*j##W-7SiZLZ}*4^|qVV1Z)Kta9u5(4XN<2%O=_9noz+k-T6m%
z|It%Z{cz?287j!p02R*ESu?Ev+F+f~9UnVO-*m2tpTAYoiE&E@dZ@6iYdoEfrW<|4
zWGqRpj;5B?p5tC|<EQ<h40ToGowcYmK1zI+_$9GwbAFR!chBCim5l>0#s|;L*ZaH+
z{#Aj71r4z2S9}t#sp@(kU%m3!u;9-!xD!Lu7sI~)W4Q87ZMwqfwKO0ggIqSiC*Jx`
zw6`4-JMsqb+>~fFX1;F+JH)Oq-(Lz}h&^GC*vBYcQbw3tpT;I}ARG{9@R&F&%<a$N
aJ#i>3J;VWVUN}#Bj4CLp0yD*8@cs=1-EnmQ

delta 587
zcmZvZp-;n55XSG`d+pY)9W8ImmJtL2OEQ5(bO{PWuw-H+C_>QKB|s1$nzIN560^)r
zZGL~mNRSu;0?FNLGtnTf_kQ2|?!9~0-`+znO#vX`P=Elt`%}!*6K})<<O7@EL}~>2
z{V|U6iH+ON$Daf<5y)T`YvzE1Md*vmR0Xdp_*J1+6=D`PH~^F4P=QbcxrG+Wwwtmm
zidf1uN>f)VLTQ8^Wg%XAQ<3Te&D3?VbEr$pP`iyweMTR;OV7Ga#uRz4%tvLuDD!QR
zr?2L~prSOe^jQzLR&!}arrF}qkbyaWno8T^*;cDL^@DC%Fbw`H@Ye<7qTpp+una=K
zxPg9xC2CrP9W<1O)|2^r^u_EumTA{$r_sT>V>eqmWey$7ziQB!Ida@!j%mW&bnHe?
c@63r~c|uBQ)WJ>1@<dAm=9Vy8x{JR501=66^#A|>