From 96d8aca732fad2198d46adcc39f7c114ea422cb9 Mon Sep 17 00:00:00 2001
From: Prabir Pradhan <prabirmsp@google.com>
Date: Tue, 13 Dec 2022 22:59:13 +0000
Subject: [PATCH 1/2] Set the USI version through the IDC file

Bug: 261596890
Test: manual with device
Change-Id: I63aa9b3b338dd1355ea837a13d5feef32b178be3
---
 NVTCapacitivePen.idc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/NVTCapacitivePen.idc b/NVTCapacitivePen.idc
index 698d0db..58d8d2c 100644
--- a/NVTCapacitivePen.idc
+++ b/NVTCapacitivePen.idc
@@ -1,2 +1,4 @@
 touch.orientationAware = 1
 touch.orientation = ORIENTATION_0
+touch.usiVersionMajor = 2
+touch.usiVersionMinor = 0

From 3fcd20eb884364ec4f218bef45103f0505238e37 Mon Sep 17 00:00:00 2001
From: Behnam Heydarshahi <bhnm@google.com>
Date: Wed, 18 Jan 2023 21:28:07 +0000
Subject: [PATCH 2/2] Ring volume icon stuck at normal

Fix the bug where dragging ring volume slider all the way to left
would not trigger an icon change, on devices that do not have
a vibrator.

Solution: offer a boolean config for volumeDownToEnterSilent.

Bug: 265459313

Test: Manual. Slide ring volume to left in settings. Ring volume
icon should switch to mute/vibrate and not get stuck at normal.

Change-Id: I71621dc2655317de8fb16b7b57d6087dfe7ceff3
---
 .../overlay/frameworks/base/core/res/res/values/config.xml     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml b/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
index 3cc4740..fd34b17 100644
--- a/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
@@ -569,6 +569,9 @@
     <!-- The default volume for the notification stream -->
     <integer name="config_audio_notif_vol_default">0</integer>
 
+    <!-- Volume policy -->
+    <bool name="config_volume_down_to_enter_silent">true</bool>
+
     <!-- This device does not allow mobile data. -->
     <bool name="config_mobile_data_capable">false</bool>