Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2e43154 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Adding system usages to car volume settings" into rvc-dev am: 574bb778 

Change-Id: I816f08e40b023ea2d32456627cad0c0bb45e1f56
parents ae84ef6c 574bb778

packages/CarSystemUI/res/values/attrs.xml

+5 −0
Original line number Diff line number Diff line
@@ -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 -->

packages/CarSystemUI/res/xml/car_volume_items.xml

+10 −0
Original line number Diff line number Diff line
@@ -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>