diff options
| author | 2020-03-02 18:09:34 +0000 | |
|---|---|---|
| committer | 2020-03-02 18:09:34 +0000 | |
| commit | 574bb77823d80e2c3572ea383b849b899130d447 (patch) | |
| tree | 7181169ecc73e6007095e031cb31fc834ca1d57f | |
| parent | be50af2116c3084dac5ecee913a7d82fb6a1e355 (diff) | |
| parent | e1000392e7204b3220e7523ce98686042afd1e04 (diff) | |
Merge "Adding system usages to car volume settings" into rvc-dev
| -rw-r--r-- | packages/CarSystemUI/res/values/attrs.xml | 5 | ||||
| -rw-r--r-- | packages/CarSystemUI/res/xml/car_volume_items.xml | 10 |
2 files changed, 15 insertions, 0 deletions
diff --git a/packages/CarSystemUI/res/values/attrs.xml b/packages/CarSystemUI/res/values/attrs.xml index 54026af4bff6..a5867638b183 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 922b1a79d45a..d371a646b85d 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> |