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

Commit bffc31ea authored by Hyunyoung Song's avatar Hyunyoung Song Committed by android-build-merger
Browse files

Upgrade launcher icon and shortcuts to adaptive icon Bug: 62023774 Test:... 

Upgrade launcher icon and shortcuts to adaptive icon Bug: 62023774 Test: build, and runs, manual testing on marlin device
am: a62e5047

Change-Id: Iec7ae7cb9338309a4a50bdb9f97e674528ee6ff4
parents e9f4a44a a62e5047

res/drawable/ic_images_shortcut.xml

+16 −13
Original line number Diff line number Diff line
@@ -15,16 +15,19 @@ 
  ~ limitations under the License.

  -->



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

    <item>

        <shape android:shape="oval">

            <solid android:color="@color/shortcut_background" />

        </shape>

    </item>

    <item

        android:drawable="@drawable/ic_images_white"

        android:top="16dp"

        android:right="16dp"

        android:bottom="16dp"

        android:left="16dp" />

</layer-list>
 
 No newline at end of file
 
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">

    <background android:drawable="@color/shortcut_background" />

    <foreground>

      <inset android:inset="33%">

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

          android:width="24dp"

          android:height="24dp"

          android:viewportHeight="24"

          android:viewportWidth="24">

        <path

          android:fillColor="@color/shortcut_foreground"

          android:pathData="M21 19V5c0,-1.1,-.9,-2,-2,-2H5c-1.1 0,-2 .9,-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2,-.9 2,-2zM8.5 13.5l2.5 3.01L14.5 12l4.5 6H5l3.5,-4.5z" />

        </vector>

      </inset>

    </foreground>

</adaptive-icon>

res/drawable/ic_images_white.xml

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    Copyright (C) 2017 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"

        android:viewportWidth="24">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M21 19V5c0,-1.1,-.9,-2,-2,-2H5c-1.1 0,-2 .9,-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2,-.9 2,-2zM8.5 13.5l2.5 3.01L14.5 12l4.5 6H5l3.5,-4.5z" />

</vector>

res/mipmap-anydpi/ic_app_icon.xml

0 → 100644
+5 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">

    <background android:drawable="@color/app_icon_background"/>

    <foreground android:drawable="@mipmap/ic_launcher_icon_foreground"/>

</adaptive-icon>

res/mipmap-anydpi/ic_launcher_downloads.xml

0 → 100644
+5 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">

    <background android:drawable="@color/downloads_icon_background"/>

    <foreground android:drawable="@mipmap/ic_launcher_downloads_foreground"/>

</adaptive-icon>

res/mipmap-hdpi/ic_app_icon.png

deleted100644 → 0
−3.35 KiB
Loading image diff...