diff --git a/audio/oriole/config/mixer_paths.xml b/audio/oriole/config/mixer_paths.xml
index 696b1da..066eed8 100644
--- a/audio/oriole/config/mixer_paths.xml
+++ b/audio/oriole/config/mixer_paths.xml
@@ -127,6 +127,15 @@
+
+
+
+
+
+
+
+
+
@@ -171,6 +180,14 @@
+
+
+
+
+
+
+
+
@@ -534,6 +551,11 @@
+
+
+
+
+
@@ -558,6 +580,14 @@
+
+
+
+
+
+
+
+
diff --git a/audio/oriole/config/mixer_paths_factory.xml b/audio/oriole/config/mixer_paths_factory.xml
index 05942f7..ccc078c 100644
--- a/audio/oriole/config/mixer_paths_factory.xml
+++ b/audio/oriole/config/mixer_paths_factory.xml
@@ -71,6 +71,10 @@
+
+
+
+
@@ -191,6 +195,7 @@
+
diff --git a/audio/raven/config/mixer_paths.xml b/audio/raven/config/mixer_paths.xml
index 696b1da..a94dfd9 100644
--- a/audio/raven/config/mixer_paths.xml
+++ b/audio/raven/config/mixer_paths.xml
@@ -127,6 +127,15 @@
+
+
+
+
+
+
+
+
+
@@ -173,6 +182,14 @@
+
+
+
+
+
+
+
+
@@ -534,6 +551,11 @@
+
+
+
+
+
@@ -558,6 +580,14 @@
+
+
+
+
+
+
+
+
diff --git a/audio/raven/config/mixer_paths_factory.xml b/audio/raven/config/mixer_paths_factory.xml
index 05942f7..ccc078c 100644
--- a/audio/raven/config/mixer_paths_factory.xml
+++ b/audio/raven/config/mixer_paths_factory.xml
@@ -71,6 +71,10 @@
+
+
+
+
@@ -191,6 +195,7 @@
+
diff --git a/audio/slider/config/mixer_paths.xml b/audio/slider/config/mixer_paths.xml
index ed7c2fe..d2c10f4 100644
--- a/audio/slider/config/mixer_paths.xml
+++ b/audio/slider/config/mixer_paths.xml
@@ -114,6 +114,15 @@
+
+
+
+
+
+
+
+
+
@@ -137,6 +146,14 @@
+
+
+
+
+
+
+
+
@@ -498,6 +515,11 @@
+
+
+
+
+
@@ -522,6 +544,14 @@
+
+
+
+
+
+
+
+
diff --git a/audio/slider/config/mixer_paths_factory.xml b/audio/slider/config/mixer_paths_factory.xml
index e35ea23..cad5bd1 100644
--- a/audio/slider/config/mixer_paths_factory.xml
+++ b/audio/slider/config/mixer_paths_factory.xml
@@ -71,6 +71,10 @@
+
+
+
+
@@ -191,6 +195,7 @@
+
diff --git a/audio/whitefin/config/mixer_paths.xml b/audio/whitefin/config/mixer_paths.xml
index ee676eb..86c8a85 100644
--- a/audio/whitefin/config/mixer_paths.xml
+++ b/audio/whitefin/config/mixer_paths.xml
@@ -128,6 +128,15 @@
+
+
+
+
+
+
+
+
+
@@ -172,6 +181,14 @@
+
+
+
+
+
+
+
+
@@ -535,6 +552,11 @@
+
+
+
+
+
@@ -559,6 +581,14 @@
+
+
+
+
+
+
+
+
diff --git a/audio/whitefin/config/mixer_paths_factory.xml b/audio/whitefin/config/mixer_paths_factory.xml
index e35ea23..cad5bd1 100644
--- a/audio/whitefin/config/mixer_paths_factory.xml
+++ b/audio/whitefin/config/mixer_paths_factory.xml
@@ -71,6 +71,10 @@
+
+
+
+
@@ -191,6 +195,7 @@
+
diff --git a/conf/init.oriole.rc b/conf/init.oriole.rc
index dd24fe4..8425b5a 100644
--- a/conf/init.oriole.rc
+++ b/conf/init.oriole.rc
@@ -28,6 +28,9 @@ on fs
chown system system /dev/goodix_fp
exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/g6.app
+ # Start the twoshay touch service
+ start twoshay
+
# Toggle glove_mode according to touch_sensitivity_mode
on property:persist.vendor.touch_sensitivity_mode=0 && property:sys.boot_completed=1
write /sys/class/spi_master/spi11/spi11.0/glove_mode 00
diff --git a/device-oriole.mk b/device-oriole.mk
index 63d69b8..f19c9a0 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -20,6 +20,7 @@ $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/proprietary/device-vendor.mk)
$(call inherit-product-if-exists, vendor/google_devices/oriole/proprietary/device-vendor.mk)
+$(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/oriole/device-vendor-oriole.mk)
DEVICE_PACKAGE_OVERLAYS += device/google/raviole/oriole/overlay
diff --git a/device-raven.mk b/device-raven.mk
index f9f351b..2040ee5 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -20,6 +20,7 @@ $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/proprietary/device-vendor.mk)
$(call inherit-product-if-exists, vendor/google_devices/raven/proprietary/device-vendor.mk)
+$(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/raven/device-vendor-raven.mk)
DEVICE_PACKAGE_OVERLAYS += device/google/raviole/raven/overlay
diff --git a/device-slider.mk b/device-slider.mk
index dd76dc3..1f77af9 100644
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -19,6 +19,7 @@ TARGET_KERNEL_DIR := device/google/raviole-kernel
$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-slider.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/proprietary/device-vendor.mk)
+$(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/slider/device-vendor-slider.mk)
DEVICE_PACKAGE_OVERLAYS += device/google/raviole/slider/overlay
diff --git a/device-whitefin.mk b/device-whitefin.mk
index 6e41a36..cd31bf4 100644
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -19,6 +19,7 @@ TARGET_KERNEL_DIR := device/google/raviole-kernel
$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-whitefin.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/proprietary/device-vendor.mk)
+$(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/whitefin/device-vendor-whitefin.mk)
DEVICE_PACKAGE_OVERLAYS += device/google/raviole/whitefin/overlay
diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
index 34d3054..5bed6f0 100644
--- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
@@ -136,6 +136,7 @@
- 2981
- 5000
- 10000
+ - 20000
- 327.8974352
- 401.1676739
- - 600.0
+ - 750.0
+ - 900.0
diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml
index a110eb6..e734336 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -135,6 +135,7 @@
- 2981
- 5000
- 10000
+ - 20000
- 327.8974352
- 401.1676739
- - 600.0
+ - 750.0
+ - 900.0