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

Commit a431fbb8 authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "Use default icon if notification icon is null." into ub-launcher3-dorval

parents 29318b1a 07e6d591

src/com/android/launcher3/notification/NotificationInfo.java

+10 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.app.ActivityOptions; 
import android.app.Notification;

import android.app.PendingIntent;

import android.content.Context;

import android.graphics.drawable.BitmapDrawable;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Icon;

import android.os.Bundle;
@@ -27,6 +28,7 @@ import android.service.notification.StatusBarNotification; 
import android.view.View;



import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherAppState;

import com.android.launcher3.graphics.IconPalette;

import com.android.launcher3.popup.PopupContainerWithArrow;

import com.android.launcher3.util.PackageUserKey;
@@ -53,8 +55,8 @@ public class NotificationInfo implements View.OnClickListener { 
    public final boolean autoCancel;

    public final boolean dismissable;



    private final int mBadgeIcon;

    private final Drawable mIconDrawable;

    private int mBadgeIcon;

    private Drawable mIconDrawable;

    private int mIconColor;

    private boolean mIsIconLarge;
@@ -82,6 +84,12 @@ public class NotificationInfo implements View.OnClickListener { 
            mIconDrawable = icon.loadDrawable(context);

            mIsIconLarge = true;

        }

        if (mIconDrawable == null) {

            mIconDrawable = new BitmapDrawable(context.getResources(), LauncherAppState

                    .getInstance(context).getIconCache()

                    .getDefaultIcon(statusBarNotification.getUser()));

            mBadgeIcon = BADGE_ICON_NONE;

        }

        intent = notification.contentIntent;

        autoCancel = (notification.flags & Notification.FLAG_AUTO_CANCEL) != 0;

        dismissable = (notification.flags & Notification.FLAG_ONGOING_EVENT) == 0;