Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use non-shadowed app icon" into sc-dev am: 0736341861 am: 670140ef0f

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

Change-Id: Ied90f5d4f1f77b4797a5db5b3e54fe5fa53dc379
This commit is contained in:
Julia Reynolds
2021-06-28 00:01:06 +00:00
committed by Automerger Merge Worker
parent b2685b338b 670140ef0f
commit f2976cccf3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SettingsLib/src/com/android/settingslib/notification/ConversationIconFactory.java
View File

@@ -33,6 +33,7 @@ import android.util.Log;
import com.android.launcher3.icons.BaseIconFactory; import com.android.launcher3.icons.BaseIconFactory;
import com.android.settingslib.R; import com.android.settingslib.R;
import com.android.settingslib.Utils;
/** /**
* Factory for creating normalized conversation icons. * Factory for creating normalized conversation icons.
@@ -99,7 +100,7 @@ public class ConversationIconFactory extends BaseIconFactory {
try { try {
final ApplicationInfo appInfo = mPackageManager.getApplicationInfoAsUser( final ApplicationInfo appInfo = mPackageManager.getApplicationInfoAsUser(
packageName, PackageManager.GET_META_DATA, userId); packageName, PackageManager.GET_META_DATA, userId);
badge = mIconDrawableFactory.getBadgedIcon(appInfo, userId); badge = Utils.getBadgedIcon(mContext, appInfo);
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
badge = mPackageManager.getDefaultActivityIcon(); badge = mPackageManager.getDefaultActivityIcon();
} }