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

Commit 9b738c98 authored by Mohit Mali's avatar Mohit Mali
Browse files

Merge branch 'fix-missing-icon-oreo' into 'v1-oreo' 

[OREO] Fix bad icons of permission groups

See merge request e/os/android_frameworks_base!90
parents 61c8114e abf050d6

core/res/res/drawable/perm_group_location.xml

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

<!--

    Copyright (C) 2015 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:viewportWidth="32"

    android:viewportHeight="32">

    android:viewportWidth="24"

    android:viewportHeight="24">



    <path

        android:fillColor="#E83A52"

        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />

    <path

        android:fillColor="#ffffff"

        android:fillType="evenOdd"

        android:pathData="M19.3888 7.49189C17.9614 6.6073 16.4265 6.34523 14.7625 6.66991L14.7532 6.67166C12.8778 7.01448 11.437 8.01029 10.3984 9.61808C9.50892 11.0139 9.18786 12.5373 9.43109 14.1792L9.43211 14.1862C9.53334 14.9151 9.75893 15.6425 10.0424 16.3839L10.043 16.3856C10.6927 18.0964 11.6086 19.7149 12.6323 21.295L12.6325 21.2954C13.6022 22.794 14.6851 24.232 15.8402 25.6323C15.8893 25.6861 15.9385 25.7407 15.9877 25.796L16.5303 25.1516C17.7357 23.6557 18.8849 22.1068 19.8751 20.4785L19.8791 20.4719C20.8996 18.8302 21.7629 17.182 22.2992 15.3806C22.6159 14.3032 22.7484 13.256 22.5715 12.2142L22.5713 12.213C22.2242 10.151 21.1797 8.57054 19.3974 7.49712L19.3888 7.49189ZM16.7214 27.3789L16.7213 27.3791L16.7211 27.3794L16.721 27.3797L16.7209 27.3799L16.7207 27.3802L16.7206 27.3805L16.7205 27.3807L16.7203 27.381L16.7202 27.3813L16.7201 27.3815L16.7199 27.3818L16.7198 27.3821L16.7197 27.3823L16.7195 27.3826L16.7194 27.3828L16.7193 27.3831L16.7191 27.3834L16.7187 27.3842L16.7186 27.3844L16.7185 27.3847L16.7182 27.3852C16.5998 27.6221 16.3706 27.7839 16.1078 27.8162C15.845 27.8486 15.5835 27.7472 15.4111 27.5461C15.3711 27.4994 15.3318 27.4536 15.2933 27.4085C15.0661 27.143 14.8635 26.9062 14.6608 26.6851C14.6515 26.675 14.6426 26.6647 14.6339 26.6542C13.4451 25.214 12.3193 23.7212 11.3053 22.1542C10.2516 20.5278 9.27074 18.8044 8.56552 16.9476C8.26237 16.1547 7.9916 15.3028 7.86683 14.4073C7.56917 12.3927 7.97054 10.4854 9.06677 8.76627L9.06915 8.76255C10.3331 6.80463 12.1423 5.54316 14.4644 5.11746C16.5006 4.7212 18.4404 5.04579 20.2173 6.14554C22.407 7.46592 23.7097 9.45261 24.1301 11.9507C24.3594 13.3019 24.1758 14.6025 23.8154 15.8278L23.8147 15.8303C23.2222 17.821 22.2798 19.604 21.2237 21.3032C20.1834 23.0136 18.9867 24.623 17.7558 26.1502C17.7522 26.1546 17.7486 26.159 17.745 26.1633L16.7214 27.3789Z" />

    <path

        android:fillColor="#ffffff"

        android:pathData="M18.6535 13.1659C18.6535 11.698 17.4566 10.4785 15.921 10.5237C14.4757 10.5688 13.324 11.7657 13.324 13.1885C13.3466 14.6563 14.5886 15.9436 16.1468 15.8307C17.5696 15.7403 18.6761 14.566 18.6535 13.1659Z" />

        android:fillColor="#000000"

        android:pathData="M12 2C8.13 2 5 5.13 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.87-3.13-7-7-7zm0

9.5c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5z" />

</vector>

core/res/res/drawable/perm_group_phone_calls.xml

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

<!--

    Copyright (C) 2015 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:viewportWidth="33"

    android:viewportHeight="33">



    <group>

        <path

            android:fillColor="#2CCF69"

            android:pathData="M25.2477 32.2327H6.75229C3.02611 32.2327 0 29.2066 0 25.4804V6.98496C0 3.25878 3.02611 0.232666 6.75229 0.232666H25.2477C28.9739 0.232666 32 3.25878 32 6.98496V25.4804C32 29.2066 28.9739 32.2327 25.2477 32.2327Z" />

        <group>

            <path

                android:fillColor="#ffffff"

                android:pathData="M7.66662 11.5772C6.91106 10.0661 7.53328 8.22162 9.0444 7.46606L11.7777 12.955C10.2666 13.7105 8.42217 13.0883 7.66662 11.5772Z" />

            <path

                android:fillColor="#ffffff"

                android:pathData="M10.4222 14.0661C8.99996 14.0661 7.64441 13.2883 6.97774 11.9328C6.02218 10.0217 6.79996 7.71054 8.71107 6.77721C9.08885 6.57721 9.55552 6.73277 9.75552 7.13277L12.4889 12.6217C12.6888 12.9994 12.5333 13.4661 12.1333 13.6661C11.5777 13.9328 11 14.0661 10.4222 14.0661ZM8.35552 11.2217C8.62218 11.7772 9.08885 12.1772 9.66663 12.3772C9.99996 12.4883 10.3333 12.5105 10.6666 12.4883L8.75552 8.62166C8.11107 9.31054 7.91107 10.355 8.35552 11.2217Z" />

            <path

                android:fillColor="#ffffff"

                android:pathData="M20.6223 24.5327C22.1334 25.2883 23.9778 24.6661 24.7334 23.155L19.2445 20.4216C18.4889 21.9327 19.1112 23.7772 20.6223 24.5327Z" />

            <path

                android:fillColor="#ffffff"

                android:pathData="M21.9778 25.6217C21.4 25.6217 20.8223 25.4884 20.2667 25.2217C18.3778 24.2884 17.6001 21.955 18.5334 20.0661C18.7334 19.6884 19.2001 19.5328 19.5778 19.7106L25.0667 22.4439C25.4445 22.6439 25.6 23.1106 25.4223 23.4884C24.7556 24.8439 23.4 25.6217 21.9778 25.6217ZM20.9556 23.8439C21.8445 24.2884 22.8889 24.0884 23.5556 23.4439L19.6889 21.5328C19.6445 21.8661 19.6889 22.1995 19.8001 22.5328C20.0001 23.0884 20.4223 23.555 20.9556 23.8439Z" />

            <path

                android:fillColor="#ffffff"

                android:pathData="M21.5111 25.777C18.7111 25.777 14.5111 23.0659 11.8445 20.3993C8.44448 16.9993 4.93337 11.0437 7.22226 8.75482C7.53337 8.44371 8.02226 8.44371 8.31115 8.75482C8.62226 9.06593 8.62226 9.55482 8.31115 9.84371C7.2667 10.9104 9.22226 15.577 12.9556 19.3104C14.7111 21.0659 16.8445 22.5993 18.8 23.4882C20.5111 24.2659 21.9334 24.4437 22.4223 23.9548C22.7334 23.6437 23.2223 23.6437 23.5111 23.9548C23.8223 24.2659 23.8223 24.7548 23.5111 25.0437C23.0223 25.5548 22.3111 25.777 21.5111 25.777Z" />

    android:viewportWidth="24"

    android:viewportHeight="24">

    <path

                android:fillColor="#ffffff"

                android:pathData="M22.2 25.0883C19.4 25.0883 15.2 22.3772 12.5333 19.7105C10.6444 17.8217 9 15.5328 8.04445 13.4217C6.93334 10.955 6.88889 9.08832 7.91111 8.0661C8.22222 7.75499 8.71111 7.75499 9 8.0661C9.31111 8.37721 9.31111 8.8661 9 9.15499C8.51111 9.64388 8.68889 11.0661 9.46667 12.7772C10.3556 14.7328 11.8667 16.8439 13.6444 18.6217C15.4 20.3772 17.5333 21.9105 19.4889 22.7994C21.2 23.5772 22.6222 23.755 23.1111 23.2661C23.4222 22.955 23.9111 22.955 24.2 23.2661C24.5111 23.5772 24.5111 24.0661 24.2 24.355C23.7111 24.8661 23.0222 25.0883 22.2 25.0883Z" />

        </group>

    </group>

        android:fillColor="#000000"

        android:pathData="M6.62 10.79c1.44 2.83 3.76 5.14 6.59 6.59l2.2-2.2c.27-.27 .67 -.36 1.02-.24 1.12

.37 2.33 .57 3.57 .57 .55 0 1 .45 1 1V20c0 .55-.45 1-1 1-9.39 0-17-7.61-17-17

0-.55 .45 -1 1-1h3.5c.55 0 1 .45 1 1 0 1.25 .2 2.45 .57 3.57 .11 .35 .03 .74-.25

1.02l-2.2 2.2z" />

</vector>

core/res/res/drawable/perm_group_storage.xml

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

<!--

  Copyright (C) 2018 The Android Open Source Project

    Copyright (C) 2015 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.
@@ -17,28 +17,11 @@ 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="32"

    android:viewportHeight="32">

    android:viewportWidth="24"

    android:viewportHeight="24">



    <path

      android:fillColor="#24527F"

      android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />

  <path

      android:fillColor="#ffffff"

      android:fillType="evenOdd"

      android:pathData="M5.578 17.5921C5.578 12.7068 9.52256 8.76221 14.4079 8.76221C14.8445 8.76221 15.1983 9.11608 15.1983 9.55261V16.8017H22.4474C22.884 16.8017 23.2378 17.1556 23.2378 17.5921C23.2378 22.4775 19.2933 26.4221 14.4079 26.4221C9.52256 26.4221 5.578 22.4775 5.578 17.5921ZM13.6175 10.3853C9.97894 10.7775 7.15881 13.847 7.15881 17.5921C7.15881 21.6044 10.3956 24.8412 14.4079 24.8412C18.1531 24.8412 21.2226 22.0211 21.6147 18.3825H14.4079C13.9714 18.3825 13.6175 18.0287 13.6175 17.5921V10.3853Z" />

  <path

      android:fillColor="#ffffff"

      android:pathData="M17.592 6.36841V14.4079H25.6316C25.6541 9.95909 22.0409 6.36841 17.592 6.36841Z" />

  <path

      android:fillColor="#ffffff"

      android:fillType="evenOdd"

      android:pathData="M16.8016 6.36841C16.8016 5.93188 17.1555 5.578 17.592 5.578C22.4737 5.578 26.4468 9.51978 26.4219 14.4119C26.4197 14.8469 26.0665 15.1983 25.6316 15.1983H17.592C17.1555 15.1983 16.8016 14.8445 16.8016 14.4079V6.36841ZM18.3824 7.20107V13.6175H24.8027C24.4532 10.2417 21.7673 7.56524 18.3824 7.20107Z" />

  <path

      android:fillColor="#ffffff"

      android:pathData="M17.592 9.16864V14.4079H22.8313C22.8313 11.5173 20.5052 9.16864 17.592 9.16864Z" />

  <path

      android:fillColor="#ffffff"

      android:fillType="evenOdd"

      android:pathData="M16.8016 8.37823H17.592C20.944 8.37823 23.6217 11.083 23.6217 14.4079V15.1983H16.8016V8.37823ZM18.3824 10.0283V13.6175H21.9714C21.6466 11.7929 20.2161 10.3537 18.3824 10.0283Z" />

        android:fillColor="#000000"

        android:pathData="M10 4H4c-1.1 0-1.99 .9 -1.99 2L2 18c0 1.1 .9 2 2 2h16c1.1 0 2-.9

2-2V8c0-1.1-.9-2-2-2h-8l-2-2z" />

</vector>