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

Commit 61d351fe authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Android (Google) Code Review
Browse files

Merge "Change application launcher icons to adaptive icons b/35429795" into ub-launcher3-dorval

parents 74480b7b 837eb1f4

AndroidManifest-common.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -49,7 +49,7 @@ 
        android:fullBackupOnly="true"

        android:fullBackupOnly="true"

        android:fullBackupContent="@xml/backupscheme"

        android:fullBackupContent="@xml/backupscheme"

        android:hardwareAccelerated="true"

        android:hardwareAccelerated="true"

        android:icon="@mipmap/ic_launcher_home"

        android:icon="@drawable/ic_launcher_home"

        android:label="@string/derived_app_name"

        android:label="@string/derived_app_name"

        android:largeHeap="@bool/config_largeHeap"

        android:largeHeap="@bool/config_largeHeap"

        android:restoreAnyVersion="true"

        android:restoreAnyVersion="true"

AndroidManifest.xml

+3 −3
Original line number Original line Diff line number Diff line
@@ -54,7 +54,7 @@ 
        android:fullBackupOnly="true"

        android:fullBackupOnly="true"

        android:fullBackupContent="@xml/backupscheme"

        android:fullBackupContent="@xml/backupscheme"

        android:hardwareAccelerated="true"

        android:hardwareAccelerated="true"

        android:icon="@mipmap/ic_launcher_home"

        android:icon="@drawable/ic_launcher_home"

        android:label="@string/derived_app_name"

        android:label="@string/derived_app_name"

        android:theme="@style/LauncherTheme"

        android:theme="@style/LauncherTheme"

        android:largeHeap="@bool/config_largeHeap"

        android:largeHeap="@bool/config_largeHeap"
@@ -135,7 +135,7 @@ 
            android:theme="@android:style/Theme.NoDisplay"

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

            android:label="* HPROF"

            android:label="* HPROF"

            android:excludeFromRecents="true"

            android:excludeFromRecents="true"

            android:icon="@mipmap/ic_launcher_home"

            android:icon="@drawable/ic_launcher_home"

            >

            >

            <intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <action android:name="android.intent.action.MAIN" />
@@ -147,7 +147,7 @@ 
        <activity

        <activity

            android:name="com.android.launcher3.testing.ToggleWeightWatcher"

            android:name="com.android.launcher3.testing.ToggleWeightWatcher"

            android:label="Show Mem"

            android:label="Show Mem"

            android:icon="@mipmap/ic_launcher_home">

            android:icon="@drawable/ic_launcher_home">

            <intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.DEFAULT" />

res/drawable-v26/mask_drawable_wrapper.xml→res/drawable-v26/adaptive_icon_drawable_wrapper.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -14,9 +14,9 @@ 
     See the License for the specific language governing permissions and

     See the License for the specific language governing permissions and

     limitations under the License.

     limitations under the License.

-->

-->

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

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

    <background android:color="#FFE0E0E0"/>

    <background android:color="#FFE0E0E0"/>

    <foreground>

    <foreground>

        <com.android.launcher3.graphics.FixedScaleDrawable />

        <com.android.launcher3.graphics.FixedScaleDrawable />

    </foreground>

    </foreground>

</maskable-icon>
 
</adaptive-icon>

res/drawable-v26/ic_launcher_home.xml

0 → 100644
+21 −0
Original line number Original line 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.

-->

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

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

    <foreground>

        <bitmap android:src="@mipmap/ic_launcher_home_foreground"/>

    </foreground>

</adaptive-icon>

res/drawable/ic_launcher_home.xml

0 → 100644
+18 −0
Original line number Original line 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.

-->

<bitmap

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

    android:src="@mipmap/ic_launcher_home" />