Merge "Use non-shadowed app icon" into sc-dev

This commit is contained in:
Julia Reynolds
2021-06-27 23:35:07 +00:00
committed by Android (Google) Code Review

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();
} }