Merge "Adding system usages to car volume settings" into rvc-dev

This commit is contained in:
Hayden Gomes
2020-03-02 18:09:34 +00:00
committed by Android (Google) Code Review
2 changed files with 15 additions and 0 deletions

View File

@@ -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 -->

View File

@@ -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>