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

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

Merge "Default icon should match platform one even on N and below devices.... 

Merge "Default icon should match platform one even on N and below devices. Bug: 63083094" into ub-launcher3-dorval-polish
am: 25284905

Change-Id: Ib05c4ab87506fe41d704b4686a84a07dfd9010bd
parents 4f16c9cc 25284905

src/com/android/launcher3/IconCache.java

+2 −1
Original line number Diff line number Diff line
@@ -120,7 +120,8 @@ public class IconCache { 
    }



    private Drawable getFullResDefaultActivityIcon() {

        return getFullResIcon(Resources.getSystem(), android.R.drawable.sym_def_app_icon);

        return getFullResIcon(Resources.getSystem(), Utilities.isAtLeastO() ?

                android.R.drawable.sym_def_app_icon : android.R.mipmap.sym_def_app_icon);

    }



    private Drawable getFullResIcon(Resources resources, int iconId) {