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

Commit 4bb5a530 authored by Romain Hunault's avatar Romain Hunault 🚴🏻
Browse files

Merge branch 'fix-icons-q' into 'v1-q' 

Fix location and privacy icon

See merge request !45
parents c5a4bbef 06135205

res/drawable/ic_homepage_location.xml

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

<!--

  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.

  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.

  -->



<layer-list xmlns:android="http://schemas.android.com/apk/res/android">



    <item>

        <com.android.settingslib.widget.AdaptiveIconShapeDrawable

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

    android:width="@dimen/dashboard_tile_image_size"

    android:height="@dimen/dashboard_tile_image_size"

            android:color="@color/homepage_location_background" />

    </item>

    android:viewportWidth="32"

    android:viewportHeight="32">



    <item

        android:width="@dimen/dashboard_tile_foreground_image_size"

        android:height="@dimen/dashboard_tile_foreground_image_size"

        android:start="@dimen/dashboard_tile_foreground_image_inset"

        android:top="@dimen/dashboard_tile_foreground_image_inset"

        android:drawable="@drawable/ic_settings_location"/>

</layer-list>
 
  <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" />

</vector>
 
 No newline at end of file

res/drawable/ic_homepage_privacy.xml

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

<!--

  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.

  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.

  -->



<layer-list xmlns:android="http://schemas.android.com/apk/res/android">



    <item>

        <com.android.settingslib.widget.AdaptiveIconShapeDrawable

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

    android:width="@dimen/dashboard_tile_image_size"

    android:height="@dimen/dashboard_tile_image_size"

            android:color="@color/homepage_privacy_background" />

    </item>



    <item

        android:width="@dimen/dashboard_tile_foreground_image_size"

        android:height="@dimen/dashboard_tile_foreground_image_size"

        android:start="@dimen/dashboard_tile_foreground_image_inset"

        android:top="@dimen/dashboard_tile_foreground_image_inset"

        android:drawable="@drawable/ic_settings_privacy"/>

</layer-list>
 
    android:viewportWidth="16.933332"

    android:viewportHeight="16.933334">

  <path

      android:pathData="M2.802,-0L14.1313,-0A2.802,2.802 0,0 1,16.9333 2.8019L16.9333,14.1313A2.802,2.802 0,0 1,14.1313 16.9333L2.802,16.9333A2.802,2.802 0,0 1,-0 14.1313L-0,2.8019A2.802,2.802 0,0 1,2.802 -0z"

      android:strokeWidth="0.171675"

      android:fillColor="#0088ed"/>

  <path

      android:pathData="M2.9164,8.4666a2.5258,5.5503 90,1 0,11.1006 0a2.5258,5.5503 90,1 0,-11.1006 0z"

      android:strokeLineJoin="miter"

      android:strokeWidth="0.410898"

      android:fillColor="#00000000"

      android:strokeColor="#ffffff"

      android:strokeLineCap="butt"/>

  <path

      android:pathData="m10.4975,8.5258a2.0308,2.0308 0,0 1,-2.0308 2.0308,2.0308 2.0308,0 0,1 -2.0308,-2.0308 2.0308,2.0308 0,0 1,2.0308 -2.0308,2.0308 2.0308,0 0,1 2.0308,2.0308"

      android:strokeLineJoin="miter"

      android:strokeWidth="0.410898"

      android:fillColor="#00000000"

      android:strokeColor="#ffffff"

      android:strokeLineCap="butt"/>

</vector>

res/drawable/ic_settings_location.xml

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

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

    android:width="24dp"

    android:height="24dp"

    android:width="@dimen/dashboard_tile_image_size"

    android:height="@dimen/dashboard_tile_image_size"

    android:viewportWidth="32"

    android:viewportHeight="32">

res/drawable/ic_settings_privacy.xml

+19 −26
Original line number Diff line number Diff line 
<!--

  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.

  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="24"

    android:viewportHeight="24">

    android:width="@dimen/dashboard_tile_image_size"

    android:height="@dimen/dashboard_tile_image_size"

    android:viewportWidth="16.933332"

    android:viewportHeight="16.933334">

  <path

      android:fillColor="#FFFFFFFF"

      android:pathData="M21.25,16.5v-0.66c0,-1.13 -1.03,-2.09 -2.25,-2.09s-2.25,0.96 -2.25,2.09v0.66H16V22h6v-5.5H21.25zM19.75,16.5h-1.5v-0.66c0,-0.29 0.38,-0.59 0.75,-0.59s0.75,0.3 0.75,0.59V16.5z"/>

      android:pathData="M2.802,-0L14.1313,-0A2.802,2.802 0,0 1,16.9333 2.8019L16.9333,14.1313A2.802,2.802 0,0 1,14.1313 16.9333L2.802,16.9333A2.802,2.802 0,0 1,-0 14.1313L-0,2.8019A2.802,2.802 0,0 1,2.802 -0z"

      android:strokeWidth="0.171675"

      android:fillColor="#0088ed"/>

  <path

      android:fillColor="#FFFFFFFF"

      android:pathData="M12,17c-3.79,0 -7.17,-2.13 -8.82,-5.5C4.83,8.13 8.21,6 12,6s7.17,2.13 8.82,5.5H23C21.27,7.11 17,4 12,4S2.73,7.11 1,11.5C2.73,15.89 7,19 12,19c0.68,0 1.35,-0.06 2,-0.17v-2.05C13.35,16.91 12.69,17 12,17z"/>

      android:pathData="M2.9164,8.4666a2.5258,5.5503 90,1 0,11.1006 0a2.5258,5.5503 90,1 0,-11.1006 0z"

      android:strokeLineJoin="miter"

      android:strokeWidth="0.410898"

      android:fillColor="#00000000"

      android:strokeColor="#ffffff"

      android:strokeLineCap="butt"/>

  <path

      android:fillColor="#FFFFFFFF"

      android:pathData="M16.43,12.23c0.04,-0.24 0.07,-0.48 0.07,-0.73C16.5,9.02 14.48,7 12,7s-4.5,2.02 -4.5,4.5S9.52,16 12,16c0.77,0 1.48,-0.21 2.12,-0.55C14.41,14.08 15.27,12.93 16.43,12.23zM12,14.2c-1.49,0 -2.7,-1.21 -2.7,-2.7s1.21,-2.7 2.7,-2.7s2.7,1.21 2.7,2.7S13.49,14.2 12,14.2z"/>

      android:pathData="m10.4975,8.5258a2.0308,2.0308 0,0 1,-2.0308 2.0308,2.0308 2.0308,0 0,1 -2.0308,-2.0308 2.0308,2.0308 0,0 1,2.0308 -2.0308,2.0308 2.0308,0 0,1 2.0308,2.0308"

      android:strokeLineJoin="miter"

      android:strokeWidth="0.410898"

      android:fillColor="#00000000"

      android:strokeColor="#ffffff"

      android:strokeLineCap="butt"/>

</vector>