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

Commit 147025fe authored by Evan Laird's avatar Evan Laird Committed by android-build-merger
Browse files

Merge "GM2 Icons (3 of (?3?))" into pi-dev 

am: 6433ac13

Change-Id: I29d49b190afa0e5309b1af956216cee0fd22592b
parents 221ff945 6433ac13

core/res/res/drawable/ic_camera.xml

+2 −5
Original line number Diff line number Diff line
@@ -19,9 +19,6 @@ Copyright (C) 2018 The Android Open Source Project 
        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"

        android:fillColor="#FFFFFF"/>

    <path

        android:pathData="M9,2L7.17,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,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"

        android:fillColor="#FFFFFF"/>

        android:fillColor="#FFFFFFFF"

        android:pathData="M20,5h-3.17L15,3H9L7.17,5H4C2.9,5 2,5.9 2,7v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V7C22,5.9 21.1,5 20,5zM20,19H4V7h16V19zM12,9c-2.21,0 -4,1.79 -4,4c0,2.21 1.79,4 4,4s4,-1.79 4,-4C16,10.79 14.21,9 12,9z"/>

</vector>
 
 No newline at end of file

core/res/res/drawable/ic_mic.xml

+5 −2
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ Copyright (C) 2018 The Android Open Source Project 
        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:pathData="M12,14c1.66,0 2.99,-1.34 2.99,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6c0,1.66 1.34,3 3,3zM17.3,11c0,3 -2.54,5.1 -5.3,5.1S6.7,14 6.7,11L5,11c0,3.41 2.72,6.23 6,6.72L11,21h2v-3.28c3.28,-0.48 6,-3.3 6,-6.72h-1.7z"

        android:fillColor="#FFFFFF"/>

        android:fillColor="#FFFFFFFF"

        android:pathData="M12,14c1.66,0 3,-1.34 3,-3V5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6C9,12.66 10.34,14 12,14zM11,5c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v6c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1V5z"/>

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M17,11c0,2.76 -2.24,5 -5,5s-5,-2.24 -5,-5H5c0,3.53 2.61,6.43 6,6.92V21h2v-3.08c3.39,-0.49 6,-3.39 6,-6.92H17z"/>

</vector>
 
 No newline at end of file

packages/SystemUI/res/drawable/ic_device_thermostat_24.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,5 +21,5 @@ Copyright (C) 2016 The Android Open Source Project 
        android:tint="?attr/colorControlNormal">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M15,13L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v8c-1.21,0.91 -2,2.37 -2,4 0,2.76 2.24,5 5,5s5,-2.24 5,-5c0,-1.63 -0.79,-3.09 -2,-4zM11,5c0,-0.55 0.45,-1 1,-1s1,0.45 1,1h-1v1h1v2h-1v1h1v2h-2L11,5z"/>

        android:pathData="M18,9h-5v2h5M21,5h-8v2h8M12,18.97c0.62,-0.83 1,-1.85 1,-2.97c0,-1.63 -0.79,-3.09 -2,-4V6c0,-1.66 -1.34,-3 -3,-3C6.34,3 5,4.34 5,6v6c-1.21,0.91 -2,2.37 -2,4c0,1.12 0.38,2.14 1,2.97V19h0.02c0.91,1.21 2.35,2 3.98,2s3.06,-0.79 3.98,-2H12V18.97zM6.2,13.6L7,13v-1V6c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v6v1l0.8,0.6c0.75,0.57 1.2,1.46 1.2,2.4H5C5,15.06 5.45,14.16 6.2,13.6z"/>

</vector>

packages/SystemUI/res/drawable/ic_mic_26dp.xml

+4 −1
Original line number Diff line number Diff line
@@ -20,5 +20,8 @@ Copyright (C) 2017 The Android Open Source Project 
        android:viewportHeight="24.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M12,14c1.66,0 2.99,-1.34 2.99,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6c0,1.66 1.34,3 3,3zM18.08,11c-0.42,0 -0.77,0.3 -0.83,0.71 -0.37,2.61 -2.72,4.39 -5.25,4.39s-4.88,-1.77 -5.25,-4.39a0.839,0.839 0,0 0,-0.83 -0.71c-0.52,0 -0.92,0.46 -0.85,0.97 0.46,2.96 2.96,5.3 5.93,5.75v2.43c0,0.47 0.38,0.85 0.85,0.85h0.31c0.47,0 0.85,-0.38 0.85,-0.85v-2.43c2.96,-0.43 5.47,-2.78 5.93,-5.75a0.87,0.87 0,0 0,-0.86 -0.97z"/>

        android:pathData="M12,14c1.66,0 3,-1.34 3,-3V5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6C9,12.66 10.34,14 12,14zM11,5c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v6c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1V5z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M17,11c0,2.76 -2.24,5 -5,5s-5,-2.24 -5,-5H5c0,3.53 2.61,6.43 6,6.92V21h2v-3.08c3.39,-0.49 6,-3.39 6,-6.92H17z"/>

</vector>

packages/SystemUI/res/drawable/ic_person.xml

+4 −4
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ Copyright (C) 2015 The Android Open Source Project 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="48.0"

        android:viewportHeight="48.0">

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#ffffffff"

        android:pathData="M24 24c4.42 0 8,-3.59 8,-8 0,-4.42,-3.58,-8,-8,-8s-8 3.58,-8 8c0 4.41 3.58 8 8 8zm0 4c-5.33 0,-16 2.67,-16 8v4h32v-4c0,-5.33,-10.67,-8,-16,-8z"/>

        android:fillColor="#FFFFFFFF"

        android:pathData="M12,6c1.1,0 2,0.9 2,2s-0.9,2 -2,2s-2,-0.9 -2,-2S10.9,6 12,6M12,15c2.7,0 5.8,1.29 6,2v1H6l0,-0.99C6.2,16.29 9.3,15 12,15M12,4C9.79,4 8,5.79 8,8s1.79,4 4,4s4,-1.79 4,-4S14.21,4 12,4L12,4zM12,13c-2.67,0 -8,1.34 -8,4v3h16v-3C20,14.34 14.67,13 12,13L12,13z"/>

</vector>