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

Commit a12bf142 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am 0b97bca6: am c4d3bb3e: am 01193e03: Specify tint on top-level vector tag, rather than fillColor 

* commit '0b97bca6':
  Specify tint on top-level vector tag, rather than fillColor
parents 29f5eeb3 0b97bca6

core/res/res/drawable/ic_audio_alarm.xml

+3 −2
Original line number Diff line number Diff line
@@ -17,8 +17,9 @@ Copyright (C) 2014 The Android Open Source Project 
        android:width="32.0dp"

        android:height="32.0dp"

        android:viewportWidth="48.0"

        android:viewportHeight="48.0">

        android:viewportHeight="48.0"

        android:tint="?attr/colorControlNormal">

    <path

        android:fillColor="?android:attr/colorControlNormal"

        android:fillColor="@color/black"

        android:pathData="M44.0,11.44l-9.19,-7.71 -2.57,3.06 9.19,7.71 2.57,-3.06zm-28.24,-4.66l-2.57,-3.06 -9.19,7.71 2.57,3.06 9.19,-7.71zm9.24,9.22l-3.0,0.0l0.0,12.0l9.49,5.71 1.51,-2.47 -8.0,-4.74l0.0,-10.5zm-1.01,-8.0c-9.95,0.0 -17.99,8.06 -17.99,18.0s8.04,18.0 17.99,18.0 18.01,-8.06 18.01,-18.0 -8.06,-18.0 -18.01,-18.0zm0.01,32.0c-7.73,0.0 -14.0,-6.27 -14.0,-14.0s6.27,-14.0 14.0,-14.0 14.0,6.27 14.0,14.0 -6.26,14.0 -14.0,14.0z"/>

</vector>

core/res/res/drawable/ic_audio_alarm_mute.xml

+3 −2
Original line number Diff line number Diff line
@@ -17,8 +17,9 @@ Copyright (C) 2014 The Android Open Source Project 
        android:width="32.0dp"

        android:height="32.0dp"

        android:viewportWidth="48.0"

        android:viewportHeight="48.0">

        android:viewportHeight="48.0"

        android:tint="?attr/colorControlNormal">

    <path

        android:fillColor="?android:attr/colorControlNormal"

        android:fillColor="@color/black"

        android:pathData="M24.0,12.0c7.73,0.0 14.0,6.27 14.0,14.0 0.0,1.69 -0.31,3.3 -0.86,4.8l3.04,3.04c1.16,-2.37 1.82,-5.03 1.82,-7.84 0.0,-9.94 -8.06,-18.0 -18.01,-18.0 -2.81,0.0 -5.46,0.66 -7.84,1.81l3.05,3.05c1.5,-0.55 3.11,-0.86 4.8,-0.86zm20.0,-0.56l-9.19,-7.71 -2.57,3.06 9.19,7.71 2.57,-3.06zm-38.16,-6.85l-2.55,2.54 2.66,2.66 -2.22,1.86 2.84,2.84 2.22,-1.86 1.6,1.6c-2.73,3.16 -4.39,7.27 -4.39,11.77 0.0,9.94 8.04,18.0 17.99,18.0 4.51,0.0 8.62,-1.67 11.77,-4.4l4.4,4.4 2.54,-2.55 -34.91,-34.91 -1.95,-1.95zm27.1,32.19c-2.43,2.01 -5.54,3.22 -8.94,3.22 -7.73,0.0 -14.0,-6.27 -14.0,-14.0 0.0,-3.4 1.21,-6.51 3.22,-8.94l19.72,19.72zm-16.91,-30.23l-2.84,-2.84 -1.7,1.43 2.84,2.84 1.7,-1.43z"/>

</vector>

core/res/res/drawable/ic_audio_media.xml

+3 −2
Original line number Diff line number Diff line
@@ -17,10 +17,11 @@ 
    android:height="32.0dp"

    android:viewportHeight="24.0"

    android:viewportWidth="24.0"

    android:width="32.0dp" >

    android:width="32.0dp"

    android:tint="?attr/colorControlNormal">



    <path

        android:fillColor="?android:attr/colorControlNormal"

        android:fillColor="@color/black"

        android:pathData="M12.0,3.0l0.0,9.28c-0.47,-0.17 -0.97,-0.28 -1.5,-0.28C8.01,12.0 6.0,14.01 6.0,16.5S8.01,21.0 10.5,21.0c2.31,0.0 4.2,-1.75 4.45,-4.0L15.0,17.0L15.0,6.0l4.0,0.0L19.0,3.0l-7.0,0.0z" />



</vector>

core/res/res/drawable/ic_audio_media_mute.xml

+4 −3
Original line number Diff line number Diff line
@@ -17,13 +17,14 @@ 
    android:height="32.0dp"

    android:viewportHeight="24.0"

    android:viewportWidth="24.0"

    android:width="32.0dp" >

    android:width="32.0dp"

    android:tint="?attr/colorControlNormal">



    <path

        android:fillColor="?android:attr/colorControlNormal"

        android:fillColor="@color/black"

        android:pathData="M15.0,6.0l4.0,0.0L19.0,3.0l-7.0,0.0l0.0,5.6l3.0,3.0C15.0,8.8 15.0,6.0 15.0,6.0z" />

    <path

        android:fillColor="?android:attr/colorControlNormal"

        android:fillColor="@color/black"

        android:pathData="M4.8,3.9L3.5,5.1l6.9,6.9C8.0,12.1 6.0,14.0 6.0,16.5C6.0,19.0 8.0,21.0 10.5,21.0c2.7,0.0 4.5,-2.3 4.5,-4.3c0.0,0.0 0.0,-0.1 0.0,-0.1l4.0,4.0l1.3,-1.3L4.8,3.9z" />



</vector>

core/res/res/drawable/ic_audio_ring_notif.xml

+3 −2
Original line number Diff line number Diff line
@@ -17,9 +17,10 @@ Copyright (C) 2014 The Android Open Source Project 
        android:width="32dp"

        android:height="32dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

        android:viewportHeight="24.0"

        android:tint="?attr/colorControlNormal">



    <path

        android:fillColor="#8A000000"

        android:fillColor="@color/black"

        android:pathData="M11.5,22.0c1.1,0.0 2.0,-0.9 2.0,-2.0l-4.0,0.0C9.5,21.1 10.4,22.0 11.5,22.0zM18.0,16.0l0.0,-5.5c0.0,-3.1 -2.1,-5.6 -5.0,-6.3L13.0,3.5C13.0,2.7 12.3,2.0 11.5,2.0C10.7,2.0 10.0,2.7 10.0,3.5l0.0,0.7c-2.9,0.7 -5.0,3.2 -5.0,6.3L5.0,16.0l-2.0,2.0l0.0,1.0l17.0,0.0l0.0,-1.0L18.0,16.0z"/>

</vector>