From e1000392e7204b3220e7523ce98686042afd1e04 Mon Sep 17 00:00:00 2001
From: Hayden Gomes <haydengomes@google.com>
Date: Mon, 3 Feb 2020 16:11:13 -0800
Subject: [PATCH] Adding system usages to car volume settings

(Cherry-picked from 353ef627803f7b9e5417c7c07659edadf4e8846c)

Bug: 144872669
Test: Build, manually play around with volume settings
Change-Id: Ia5589689e5c37be3898ac1edb2df00b84280cb7d
Merged-In: Ia5589689e5c37be3898ac1edb2df00b84280cb7d
---
 packages/CarSystemUI/res/values/attrs.xml         |  5 +++++
 packages/CarSystemUI/res/xml/car_volume_items.xml | 10 ++++++++++
 2 files changed, 15 insertions(+)

diff --git a/packages/CarSystemUI/res/values/attrs.xml b/packages/CarSystemUI/res/values/attrs.xml
index 54026af4bff6d..a5867638b183e 100644
--- a/packages/CarSystemUI/res/values/attrs.xml
+++ b/packages/CarSystemUI/res/values/attrs.xml
@@ -96,6 +96,11 @@
             <!-- hidden, do not use -->
             <!-- enum name="virtual_source" value="15"/ -->
             <enum name="assistant" value="16"/>
+            <enum name="call_assistant" value="17"/>
+            <enum name="emergency" value="1000"/>
+            <enum name="safety" value="1001"/>
+            <enum name="vehicle_status" value="1002"/>
+            <enum name="announcement" value="1003"/>
         </attr>
 
         <!-- Icon resource ids to render on UI -->
diff --git a/packages/CarSystemUI/res/xml/car_volume_items.xml b/packages/CarSystemUI/res/xml/car_volume_items.xml
index 922b1a79d45aa..d371a646b85db 100644
--- a/packages/CarSystemUI/res/xml/car_volume_items.xml
+++ b/packages/CarSystemUI/res/xml/car_volume_items.xml
@@ -51,5 +51,15 @@
         car:icon="@drawable/car_ic_music"/>
   <item car:usage="assistant"
         car:icon="@drawable/car_ic_music"/>
+  <item car:usage="call_assistant"
+        car:icon="@*android:drawable/ic_audio_ring_notif"/>
+  <item car:usage="emergency"
+        car:icon="@drawable/ic_volume_alarm"/>
+  <item car:usage="safety"
+        car:icon="@drawable/ic_volume_alarm"/>
+  <item car:usage="vehicle_status"
+        car:icon="@drawable/car_ic_notification"/>
+  <item car:usage="announcement"
+        car:icon="@drawable/car_ic_notification"/>
 </carVolumeItems>