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

Commit c3c003d7 authored by Anthony Tripaldi's avatar Anthony Tripaldi Committed by android-build-merger
Browse files

Merge "Update caption toggle icon with GM2 icons used elsewhere in the system." into qt-dev 

am: 9a5f74f0

Change-Id: I6d161e052f6111b5c8978878f585ad9da57e03d9
parents 96897dcd 9a5f74f0

packages/SystemUI/res/drawable/ic_volume_odi_captions.xml

+3 −20
Original line number Original line Diff line number Diff line
@@ -19,23 +19,6 @@ 
    android:viewportWidth="24"

    android:viewportWidth="24"

    android:viewportHeight="24">

    android:viewportHeight="24">

    <path

    <path

      android:pathData="M16,12h2v2h-2z"

        android:fillColor="#FF000000"

      android:fillColor="#1A73E8"

        android:pathData="M20,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,18L4,18L4,6h16v12zM6,10h2v2L6,12zM6,14h8v2L6,16zM16,14h2v2h-2zM10,10h8v2h-8z"/>

      android:fillType="nonZero"/>

  <path

      android:pathData="M6,12h8v2h-8z"

      android:fillColor="#1A73E8"

      android:fillType="nonZero"/>

  <path

      android:pathData="M20,2C21.1046,2 22,2.8954 22,4L22,16C22,17.1046 21.1046,18 20,18L6,18L2,22L2,4C2,2.8954 2.8954,2 4,2L20,2ZM20,16L20,4L4,4L4,16L20,16Z"

      android:fillColor="#1A73E8"

      android:fillType="nonZero"/>

  <path

      android:pathData="M6,8h2v2h-2z"

      android:fillColor="#1A73E8"

      android:fillType="nonZero"/>

  <path

      android:pathData="M10,8h8v2h-8z"

      android:fillColor="#1A73E8"

      android:fillType="nonZero"/>

</vector>
 
</vector>

packages/SystemUI/res/drawable/ic_volume_odi_captions_disabled.xml

+12 −16
Original line number Original line Diff line number Diff line
@@ -19,19 +19,15 @@ 
    android:viewportWidth="24"

    android:viewportWidth="24"

    android:viewportHeight="24">

    android:viewportHeight="24">

    <path

    <path

      android:pathData="M2.07,0.64L22,20.59L20.6,22L16.6,18L6,18L2,22L2,4C2.0006,3.8236 2.0276,3.6484 2.08,3.48L0.66,2.05L2.07,0.64ZM5.17,16L14.6,16L12.6,14L6,14L6,12L10.6,12L8,9.4L8,10L6,10L6,8L6.6,8L4,5.4L4,16L5.17,16Z"

        android:fillColor="#FF000000"

      android:fillColor="#1A73E8"

        android:pathData="M18,10l-5.18,0l2,2l3.18,0z"/>

      android:fillType="nonZero"/>

    <path

    <path

      android:pathData="M18,12l-1.74,0l1.74,1.74z"

        android:fillColor="#FF000000"

      android:fillColor="#1A73E8"

        android:pathData="M18,14l-1.19,0l1.19,1.19z"/>

      android:fillType="nonZero"/>

    <path

    <path

      android:pathData="M18,8l-5.74,0l2,2l3.74,0z"

        android:fillColor="#FF000000"

      android:fillColor="#1A73E8"

        android:pathData="M2,2L0.58,3.41l1.66,1.66C2.09,5.35 2,5.66 2,6v12c0,1.1 0.9,2 2,2h13.17l2.61,2.61l1.41,-1.41L2,2zM4,18V6.83L7.17,10H6v2h2v-1.17L11.17,14H6v2h7.17l2,2H4z"/>

      android:fillType="nonZero"/>

    <path

    <path

      android:pathData="M20,4L20,15.74L21.53,17.27C21.8296,16.9142 21.9958,16.4651 22,16L22,4C22,2.8954 21.1046,2 20,2L6.26,2L8.26,4L20,4Z"

        android:fillColor="#FF000000"

      android:fillColor="#1A73E8"

        android:pathData="M20,4H6.82l2,2H20v11.19l1.75,1.75C21.91,18.66 22,18.34 22,18V6C22,4.9 21.1,4 20,4z"/>

      android:fillType="nonZero"/>

</vector>
 
</vector>