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

Commit 1f093dd9 authored by Hyunyoung Song's avatar Hyunyoung Song
Browse files

Change launcher and shortcut icons to MaskableIconDrawable 

Test: manual test on Launcher3
Bug: 33034275
Bug: 35431198

Change-Id: Ief9f49ec38ec95daa738799398fc4b458d634acc
parent b4d6b4f7

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ 
    <uses-permission android:name="android.permission.DELETE_PACKAGES"/>



    <application android:label="@string/settings_label"

            android:icon="@mipmap/ic_launcher_settings"

            android:icon="@drawable/ic_launcher_settings"

            android:taskAffinity=""

            android:theme="@style/Theme.Settings"

            android:hardwareAccelerated="true"

res/drawable/ic_launcher_settings.xml

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

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

    <background android:drawable="?android:attr/colorAccent"/>

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

</maskable-icon>

res/drawable/ic_shortcut_battery.xml

+17 −14
Original line number Diff line number Diff line
@@ -14,17 +14,20 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

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

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

    <foreground>

        <vector

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

    android:width="80dp"

    android:height="80dp"

    android:viewportWidth="52.0"

    android:viewportHeight="52.0" >

    <path

        android:fillColor="#FFF5F5F5"

        android:pathData="M2,26a24,24 0 1,0 48,0a24,24 0 1,0 -48,0"/>

          android:width="120dp"

          android:height="120dp"

          android:viewportWidth="78.0"

          android:viewportHeight="78.0">

            <group android:translateX="13.0" android:translateY="13.0">

                <path

                    android:fillColor="@*android:color/accent_device_default_light"

                    android:pathData="M29.67,18H28v-2h-4v2h-1.67C21.6,18,21,18.6,21,19.33v15.33C21,35.4,21.6,36,22.33,36h7.33

                            C30.4,36,31,35.4,31,34.67V19.33C31,18.6,30.4,18,29.67,18z"/>

            </group>

        </vector>

    </foreground>

</maskable-icon>
 
 No newline at end of file

res/drawable/ic_shortcut_data_usage.xml

+18 −15
Original line number Diff line number Diff line
@@ -14,18 +14,21 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

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

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

    <foreground>

        <vector

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

    android:width="80dp"

    android:height="80dp"

    android:viewportWidth="52.0"

    android:viewportHeight="52.0" >

    <path

        android:fillColor="#FFF5F5F5"

        android:pathData="M2,26a24,24 0 1,0 48,0a24,24 0 1,0 -48,0"/>

          android:width="120dp"

          android:height="120dp"

          android:viewportWidth="78.0"

          android:viewportHeight="78.0">

            <group android:translateX="13.0" android:translateY="13.0">

                <path

                    android:fillColor="@*android:color/accent_device_default_light"

                    android:pathData="M27,16.05v3.03c3.39,0.49,6,3.39,6,6.92c0,0.9-0.18,1.75-0.48,2.54l2.6,1.53C35.68,28.83,36,27.45,36,26

                            C36,20.82,32.05,16.55,27,16.05z M26,33c-3.87,0-7-3.13-7-7c0-3.53,2.61-6.43,6-6.92v-3.03c-5.06,0.5-9,4.76-9,9.95

                            c0,5.52,4.47,10,9.99,10c3.31,0,6.24-1.61,8.06-4.09l-2.6-1.53C30.17,31.98,28.21,33,26,33z"/>

            </group>

        </vector>

    </foreground>

</maskable-icon>
 
 No newline at end of file

res/drawable/ic_shortcut_wireless.xml

+16 −13
Original line number Diff line number Diff line
@@ -14,16 +14,19 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

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

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

    <foreground>

        <vector

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

    android:width="80dp"

    android:height="80dp"

    android:viewportWidth="52.0"

    android:viewportHeight="52.0" >

    <path

        android:fillColor="#FFF5F5F5"

        android:pathData="M2,26a24,24 0 1,0 48,0a24,24 0 1,0 -48,0"/>

            android:width="120dp"

            android:height="120dp"

            android:viewportWidth="78.0"

            android:viewportHeight="78.0">

            <group android:translateX="13.0" android:translateY="13.0">

                <path

                    android:fillColor="@*android:color/accent_device_default_light"

                    android:pathData="M26.01,35.49L37.64,21c-0.45-0.34-4.93-4-11.64-4c-6.72,0-11.19,3.66-11.64,4l11.63,14.49L26,35.5L26.01,35.49z"/>

            </group>

        </vector>

    </foreground>

</maskable-icon>
 
 No newline at end of file