From d4b713a196af5c42298cd941e95a9e4c05ecc36a Mon Sep 17 00:00:00 2001
From: Chris Paulo <chrispaulo@google.com>
Date: Mon, 5 Dec 2022 21:58:50 +0000
Subject: [PATCH 1/2] device/bluejay: Add adaptive haptics props

Add default adaptive haptics props for bluejay.

Bug: 198239103
Test: Verified functionality
Change-Id: I43a0dc0a84d682d8f71ae4ebac14cc123bd60ec4
Signed-off-by: Chris Paulo <chrispaulo@google.com>
---
 device-bluejay.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/device-bluejay.mk b/device-bluejay.mk
index d040cd4..7203de7 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -221,10 +221,16 @@ endif
 PRODUCT_SHIPPING_API_LEVEL := 32
 
 # Vibrator HAL
+ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1
 PRODUCT_VENDOR_PROPERTIES += \
 	ro.vendor.vibrator.hal.supported_primitives=243 \
 	ro.vendor.vibrator.hal.f0.comp.enabled=0 \
-	ro.vendor.vibrator.hal.redc.comp.enabled=0
+	ro.vendor.vibrator.hal.redc.comp.enabled=0 \
+	persist.vendor.vibrator.hal.context.enable=false \
+	persist.vendor.vibrator.hal.context.scale=40 \
+	persist.vendor.vibrator.hal.context.fade=true \
+	persist.vendor.vibrator.hal.context.cooldowntime=1600 \
+	persist.vendor.vibrator.hal.context.settlingtime=5000
 
 # Device features
 PRODUCT_COPY_FILES += \

From 6bac44096a3b2e8e121c4230fa904c2aec7a0482 Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Wed, 22 Mar 2023 18:23:16 +0000
Subject: [PATCH 2/2] Remove unused dimen auth_ripple_alpha_in_duration

Bug: 274785453
Test: device builds
Change-Id: I256a62c02ba499a43ded9d6c8cf84df7be11a0ae
---
 .../frameworks/base/packages/SystemUI/res/values/dimens.xml   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/bluejay/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/bluejay/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index c57de12..5e4f716 100644
--- a/bluejay/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/bluejay/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -49,10 +49,6 @@
     <!-- Padding for the lock icon on the keyguard. In pixels - should not scale with display size. -->
     <dimen name="lock_icon_padding">56px</dimen>
 
-    <!-- Alpha in duration in ms for the auth ripple to become fully vislble.
-         If set to 0, it is immediately visible, which is desired for devices supporting UDFPS. -->
-    <integer name="auth_ripple_alpha_in_duration">0</integer>
-
     <!-- Offset should not be more than 1mm -->
     <dimen name="udfps_burn_in_offset_y">16px</dimen>
 </resources>