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

Commit ae84eec0 authored by Makoto Onuki's avatar Makoto Onuki Committed by android-build-merger
Browse files

Merge "Fix activity icon badging for non-bitmap icons" into oc-dev 

am: 9f607f4c

Change-Id: Idd94f2e79bc1cad94995a88e647823870dcb0cee
parents 45fe4360 9f607f4c

core/java/android/content/pm/LauncherActivityInfo.java

+1 −9
Original line number Original line Diff line number Diff line
@@ -20,12 +20,10 @@ import android.content.ComponentName; 
import android.content.Context;

import android.content.Context;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.res.Resources;

import android.content.res.Resources;

import android.graphics.drawable.BitmapDrawable;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Drawable;

import android.os.UserHandle;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.UserManager;

import android.util.DisplayMetrics;

import android.util.DisplayMetrics;

import android.util.Log;





/**

/**

 * A representation of an activity that can belong to this user or a managed

 * A representation of an activity that can belong to this user or a managed
@@ -173,12 +171,6 @@ public class LauncherActivityInfo { 
    public Drawable getBadgedIcon(int density) {

    public Drawable getBadgedIcon(int density) {

        Drawable originalIcon = getIcon(density);

        Drawable originalIcon = getIcon(density);





        if (originalIcon instanceof BitmapDrawable) {

            // TODO: Go through LauncherAppsService

        return mPm.getUserBadgedIcon(originalIcon, mUser);

        return mPm.getUserBadgedIcon(originalIcon, mUser);

        } else {

            Log.e(TAG, "Unable to create badged icon for " + mActivityInfo);

        }

        return originalIcon;

    }

    }

}
 
}