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

Commit 670140ef authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Merge "Use non-shadowed app icon" into sc-dev am: 07363418 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15112055

Change-Id: I451d02fcab4c9dcc90905ef1eace54862068d3ce
parents 2421f89f 07363418

packages/SettingsLib/src/com/android/settingslib/notification/ConversationIconFactory.java

+2 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.util.Log; 


import com.android.launcher3.icons.BaseIconFactory;

import com.android.settingslib.R;

import com.android.settingslib.Utils;



/**

 * Factory for creating normalized conversation icons.
@@ -99,7 +100,7 @@ public class ConversationIconFactory extends BaseIconFactory { 
        try {

            final ApplicationInfo appInfo = mPackageManager.getApplicationInfoAsUser(

                    packageName, PackageManager.GET_META_DATA, userId);

            badge = mIconDrawableFactory.getBadgedIcon(appInfo, userId);

            badge = Utils.getBadgedIcon(mContext, appInfo);

        } catch (PackageManager.NameNotFoundException e) {

            badge = mPackageManager.getDefaultActivityIcon();

        }