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

Commit e3cd0af3 authored by Ricky Wai's avatar Ricky Wai Committed by Android Git Automerger
Browse files

am 662ec915: am 227d42db: Merge "Fix LauncherActivityInfo.getBadgedIcon()... 

am 662ec915: am 227d42db: Merge "Fix LauncherActivityInfo.getBadgedIcon() cannot get high density icon" into mnc-dev

* commit '662ec915':
  Fix LauncherActivityInfo.getBadgedIcon() cannot get high density icon
parents 0835c1f3 662ec915

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

+43 −12
Original line number Diff line number Diff line
@@ -103,20 +103,30 @@ public class LauncherActivityInfo { 
     * density DPI values from {@link DisplayMetrics}.

     * @see #getBadgedIcon(int)

     * @see DisplayMetrics

     * @return The drawable associated with the activity

     * @return The drawable associated with the activity.

     */

    public Drawable getIcon(int density) {

        int iconRes = mResolveInfo.getIconResource();

        Resources resources = null;

        Drawable icon = null;

        // Get the preferred density icon from the app's resources

        if (density != 0 && iconRes != 0) {

            try {

                resources = mPm.getResourcesForApplication(mActivityInfo.applicationInfo);

                icon = resources.getDrawableForDensity(iconRes, density);

            } catch (NameNotFoundException | Resources.NotFoundException exc) {

        final int iconRes = mResolveInfo.getIconResource();

        Drawable icon = getDrawableForDensity(iconRes, density);

        // Get the default density icon

        if (icon == null) {

            icon = mResolveInfo.loadIcon(mPm);

        }

        return icon;

    }



    /**

     * Returns the icon for this activity, without any badging for the profile.

     * This function can get the icon no matter the icon needs to be badged or not.

     * @param density The preferred density of the icon, zero for default density. Use

     * density DPI values from {@link DisplayMetrics}.

     * @see #getBadgedIcon(int)

     * @see DisplayMetrics

     * @return The drawable associated with the activity.

     */

    private Drawable getOriginalIcon(int density) {

        final int iconRes = mResolveInfo.getIconResourceInternal();

        Drawable icon = getDrawableForDensity(iconRes, density);

        // Get the default density icon

        if (icon == null) {

            icon = mResolveInfo.loadIcon(mPm);
@@ -124,6 +134,27 @@ public class LauncherActivityInfo { 
        return icon;

    }



    /**

     * Returns the drawable for this activity, without any badging for the profile.

     * @param resource id of the drawable.

     * @param density The preferred density of the icon, zero for default density. Use

     * density DPI values from {@link DisplayMetrics}.

     * @see DisplayMetrics

     * @return The drawable associated with the resource id.

     */

    private Drawable getDrawableForDensity(int iconRes, int density) {

        // Get the preferred density icon from the app's resources

        if (density != 0 && iconRes != 0) {

            try {

                final Resources resources

                        = mPm.getResourcesForApplication(mActivityInfo.applicationInfo);

                return resources.getDrawableForDensity(iconRes, density);

            } catch (NameNotFoundException | Resources.NotFoundException exc) {

            }

        }

        return null;

    }



    /**

     * Returns the application flags from the ApplicationInfo of the activity.

     *
@@ -167,7 +198,7 @@ public class LauncherActivityInfo { 
     * @return A badged icon for the activity.

     */

    public Drawable getBadgedIcon(int density) {

        Drawable originalIcon = getIcon(density);

        Drawable originalIcon = getOriginalIcon(density);



        if (originalIcon instanceof BitmapDrawable) {

            return mPm.getUserBadgedIcon(originalIcon, mUser);

core/java/android/content/pm/ResolveInfo.java

+16 −4
Original line number Diff line number Diff line
@@ -226,11 +226,11 @@ public class ResolveInfo implements Parcelable { 
     * Return the icon resource identifier to use for this match.  If the

     * match defines an icon, that is used; else if the activity defines

     * an icon, that is used; else, the application icon is used.

     * This function does not check noResourceId flag.

     *

     * @return The icon associated with this match.

     */

    public final int getIconResource() {

        if (noResourceId) return 0;

    final int getIconResourceInternal() {

        if (icon != 0) return icon;

        final ComponentInfo ci = getComponentInfo();

        if (ci != null) {
@@ -239,6 +239,18 @@ public class ResolveInfo implements Parcelable { 
        return 0;

    }



    /**

     * Return the icon resource identifier to use for this match.  If the

     * match defines an icon, that is used; else if the activity defines

     * an icon, that is used; else, the application icon is used.

     *

     * @return The icon associated with this match.

     */

    public final int getIconResource() {

        if (noResourceId) return 0;

        return getIconResourceInternal();

    }



    public void dump(Printer pw, String prefix) {

        if (filter != null) {

            pw.println(prefix + "Filter:");