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

Commit e0e49140 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update photo, accessibility, memory, sim, and warning icons" into pi-dev

parents 28dc3917 3802b632

res/drawable/ic_photo_library.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,5 +21,5 @@ 
        android:tint="?android:attr/colorControlNormal">

    <path

        android:fillColor="#FF000000"

        android:pathData="M22,16V4c0,-1.11 -0.9,-2 -2,-2H8C6.89,2 6,2.89 6,4v12c0,1.1 0.89,2 2,2h12C21.1,18 22,17.1 22,16zM11,12l2.03,2.71L16,11l4,5H8L11,12zM2,7v13c0,1.1 0.9,2 2,2h13c0.55,0 1,-0.45 1,-1v0c0,-0.55 -0.45,-1 -1,-1H4.5C4.22,20 4,19.78 4,19.5V7c0,-0.55 -0.45,-1 -1,-1h0C2.45,6 2,6.45 2,7z"/>

        android:pathData="M20,4v12H8V4H20M20,2H8C6.9,2 6,2.9 6,4v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4C22,2.9 21.1,2 20,2L20,2zM2,6v14c0,1.1 0.9,2 2,2h14v-2H4V6H2zM15.67,11l-2.5,2.98L11.5,11.8L9,15h10L15.67,11z"/>

</vector>

res/drawable/ic_settings_accessibility.xml

+4 −1
Original line number Diff line number Diff line
@@ -20,5 +20,8 @@ 
        android:viewportHeight="24.0">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M20.75,6.99c-0.14,-0.55 -0.69,-0.87 -1.24,-0.75C17.13,6.77 14.48,7 12,7S6.87,6.77 4.49,6.24c-0.55,-0.12 -1.1,0.2 -1.24,0.75l0,0C3.11,7.55 3.45,8.12 4,8.25C5.61,8.61 7.35,8.86 9,9v12c0,0.55 0.45,1 1,1h0c0.55,0 1,-0.45 1,-1v-5h2v5c0,0.55 0.45,1 1,1h0c0.55,0 1,-0.45 1,-1V9c1.65,-0.14 3.39,-0.39 5,-0.75C20.55,8.12 20.89,7.55 20.75,6.99L20.75,6.99zM12,6c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2s-2,0.9 -2,2S10.9,6 12,6z"/>

        android:pathData="M20.5,4c-2.61,0.7 -5.67,1 -8.5,1S6.11,4.7 3.5,4L3,6c1.86,0.5 4,0.83 6,1v13h2v-6h2v6h2V7c2,-0.17 4.14,-0.5 6,-1L20.5,4zM12,4c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2s-2,0.9 -2,2S10.9,4 12,4z"/>

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M7,24h2v-2H7V24zM11,24h2v-2h-2V24zM15,24h2v-2h-2V24z"/>

</vector>

res/drawable/ic_settings_memory.xml

+2 −15
Original line number Diff line number Diff line
@@ -20,19 +20,6 @@ 
        android:viewportHeight="24.0"

        android:tint="?android:attr/colorControlNormal">

    <path

        android:pathData="M6.0,4.0l0.0,16.0 12.0,0.0 0.0,-16.0 -12.0,0.0z

        M6.0,5.25l0,1.5 -3,0 0,-1.5 3,0z

        M6.0,9.25l0,1.5 -3,0 0,-1.5 3,0z

        M6.0,13.25l0,1.5 -3,0 0,-1.5 3,0z

        M6.0,17.25l0,1.5 -3,0 0,-1.5 3,0z

        M21.0,5.25l0,1.5 -3,0 0,-1.5 3,0z

        M21.0,9.25l0,1.5 -3,0 0,-1.5 3,0z

        M21.0,13.25l0,1.5 -3,0 0,-1.5 3,0z

        M21.0,17.25l0,1.5 -3,0 0,-1.5 3,0z



        M11.5,14.5l1,0 0,3 -1,0 0,-3z

        M13.25,14.5l1,0 0,3 -1,0 0,-3z

        M15.0,14.5l1,0 0,3 -1,0 0,-3z

        "

        android:fillColor="@android:color/black" />

        android:fillColor="@android:color/black"

        android:pathData="M15,9H9v6h6V9zM21,11V9h-2V7c0,-1.1 -0.9,-2 -2,-2h-2V3h-2v2h-2V3H9v2H7C5.9,5 5,5.9 5,7v2H3v2h2v2H3v2h2v2c0,1.1 0.9,2 2,2h2v2h2v-2h2v2h2v-2h2c1.1,0 2,-0.9 2,-2v-2h2v-2h-2v-2H21zM17,17H7V7h10V17z"/>

</vector>

res/drawable/ic_settings_sim.xml

+21 −4
Original line number Diff line number Diff line
@@ -16,13 +16,30 @@ 
-->



<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24.0dp"

        android:height="24.0dp"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?android:attr/colorControlNormal">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M19.99 4c0-1.1-.89-2-1.99-2h-8L4 8v12c0 1.1.9 2 2 2h12.01c1.1 0 1.99-.9 1.99-2l-.01-16zM9 19H7v-2h2v2zm8 0h-2v-2h2v2zm-8-4H7v-4h2v4zm4 4h-2v-4h2v4zm0-6h-2v-2h2v2zm4 2h-2v-4h2v4z"/>

      <path android:pathData="M0 0h24v24H0z"/>

        android:pathData="M18,2h-8L4,8v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4C20,2.9 19.1,2 18,2zM18,4v16H6V8.83L10.83,4L18,4L18,4z"/>

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M7,17h2v2h-2z"/>

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M15,17h2v2h-2z"/>

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M7,11h2v4h-2z"/>

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M11,15h2v4h-2z"/>

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M11,11h2v2h-2z"/>

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M15,11h2v4h-2z"/>

</vector>

res/drawable/ic_warning_24dp.xml

+10 −4
Original line number Diff line number Diff line 
<!--

Copyright (C) 2015 The Android Open Source Project

Copyright (C) 2018 The Android Open Source Project



   Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.
@@ -16,9 +16,15 @@ Copyright (C) 2015 The Android Open Source Project 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="48.0"

        android:viewportHeight="48.0">

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M2 42h44L24 4 2 42zm24,-6h-4v-4h4v4zm0,-8h-4v-8h4v8z"/>

        android:pathData="M12,5.99L19.53,19H4.47L12,5.99M12,2L1,21h22L12,2L12,2z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M13,16l-2,0l0,2l2,0l0,-2z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M13,10l-2,0l0,4l2,0l0,-4z"/>

</vector>