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

Commit a6d8523a authored by John Shao's avatar John Shao
Browse files

DO NOT MERGE Redo import vector drawables 

Some vector drawables were invalid on API level 21
so reimporting them.

Bug: 30859362
Change-Id: I2a25da781c317507e3ff0302aa9aebbfb488eb5c
parent 6e250a00

res/drawable/ic_add.xml

+18 −3
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2016 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.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



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

        android:width="24dp"

        android:height="24dp"

        android:viewportHeight="24.0"

        android:viewportWidth="24.0">

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>

        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>

</vector>

res/drawable/ic_google_plus_black_24dp.xml

+5 −6
Original line number Diff line number Diff line
@@ -14,13 +14,12 @@ 
     limitations under the License.

-->



<!-- G+ icon -->

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

        android:width="24dp"

        android:height="24dp"

        android:viewportHeight="24.0"

        android:viewportWidth="24.0">

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

            android:fillColor="#000000"

            android:pathData="M23 11h-2V9h-2v2h-2v2h2v2h2v-2h2zM8 11v2.4h3.97c-.16 1.03-1.2 3.02-3.97 3.02-2.39 0-4.34-1.98-4.34-4.42S5.61 7.58 8 7.58c1.36 0 2.27.58 2.79 1.08l1.9-1.83C11.47 5.69 9.89 5 8 5c-3.87 0-7 3.13-7 7s3.13 7 7 7c4.04 0 6.72-2.84 6.72-6.84 0-.46-.05-.81-.11-1.16H8z" />

        android:fillColor="#FF000000"

        android:pathData="M23,11h-2V9h-2v2h-2v2h2v2h2v-2h2zM8,11v2.4h3.97c-0.16,1.03 -1.2,3.02 -3.97,3.02 -2.39,0 -4.34,-1.98 -4.34,-4.42S5.61,7.58 8,7.58c1.36,0 2.27,0.58 2.79,1.08l1.9,-1.83C11.47,5.69 9.89,5 8,5c-3.87,0 -7,3.13 -7,7s3.13,7 7,7c4.04,0 6.72,-2.84 6.72,-6.84 0,-0.46 -0.05,-0.81 -0.11,-1.16H8z"/>

</vector>

res/drawable/ic_history_24dp.xml

+5 −6
Original line number Diff line number Diff line
@@ -14,13 +14,12 @@ 
     limitations under the License.

-->



<!-- History icon -->

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

        android:width="24dp"

        android:height="24dp"

        android:viewportHeight="24.0"

        android:viewportWidth="24.0">

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M13 3c-4.97 0-9 4.03-9 9H1l3.89 3.89.07.14L9 12H6c0-3.87 3.13-7 7-7s7 3.13 7 7-3.13 7-7 7c-1.93 0-3.68-.79-4.94-2.06l-1.42 1.42C8.27 19.99 10.51 21 13 21c4.97 0 9-4.03 9-9s-4.03-9-9-9zm-1 5v5l4.28 2.54.72-1.21-3.5-2.08V8H12z"/>

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

        android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z"/>

</vector>

res/drawable/ic_menu_delete.xml

+3 −4
Original line number Diff line number Diff line
@@ -14,13 +14,12 @@ 
     limitations under the License.

-->



<!-- A trash can icon (ic_menu_delete) -->

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

        android:width="24dp"

        android:height="24dp"

        android:viewportHeight="24.0"

        android:viewportWidth="24.0">

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="@color/actionbar_icon_color_grey"

        android:pathData="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"/>

        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>

</vector>

res/drawable/ic_menu_duplicates.xml

+18 −3
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2016 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.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



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

        android:width="24dp"

        android:height="24dp"

        android:viewportHeight="24.0"

        android:viewportWidth="24.0">

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M16 1H4c-1.1 0-2 .9-2 2v14h2V3h12V1zm3 4H8c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h11c1.1 0 2-.9 2-2V7c0-1.1-.9-2-2-2zm0 16H8V7h11v14z"/>

        android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/>

</vector>