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

Commit 627006ee authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Moving icon generation out of ShortcutInfo constructor so that it can... 

Merge "Moving icon generation out of ShortcutInfo constructor so that it can be created on the UI thread" into ub-launcher3-master
parents 197f97bd 1b072635

src/com/android/launcher3/InstallShortcutReceiver.java

+3 −1
Original line number Diff line number Diff line
@@ -457,7 +457,9 @@ public class InstallShortcutReceiver extends BroadcastReceiver { 
                }

                return si;

            } else if (shortcutInfo != null) {

                return new ShortcutInfo(shortcutInfo, mContext);

                ShortcutInfo si = new ShortcutInfo(shortcutInfo, mContext);

                si.iconBitmap = LauncherIcons.createShortcutIcon(shortcutInfo, mContext);

                return si;

            } else if (providerInfo != null) {

                LauncherAppWidgetProviderInfo info = LauncherAppWidgetProviderInfo

                        .fromProviderInfo(mContext, providerInfo);

src/com/android/launcher3/LauncherModel.java

+14 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import com.android.launcher3.config.ProviderConfig; 
import com.android.launcher3.dynamicui.ExtractionUtils;

import com.android.launcher3.folder.Folder;

import com.android.launcher3.folder.FolderIcon;

import com.android.launcher3.graphics.LauncherIcons;

import com.android.launcher3.logging.FileLog;

import com.android.launcher3.model.AddWorkspaceItemsTask;

import com.android.launcher3.model.BgDataModel;
@@ -1330,6 +1331,8 @@ public class LauncherModel extends BroadcastReceiver 
                                            continue;

                                        }

                                        info = new ShortcutInfo(pinnedShortcut, context);

                                        info.iconBitmap = LauncherIcons

                                                .createShortcutIcon(pinnedShortcut, context);

                                        intent = info.intent;

                                    } else {

                                        // Create a shortcut info in disabled mode for now.
@@ -2201,6 +2204,17 @@ public class LauncherModel extends BroadcastReceiver 
        }

    }



    public void updateAndBindShortcutInfo(final ShortcutInfo si, final ShortcutInfoCompat info) {

        updateAndBindShortcutInfo(new Provider<ShortcutInfo>() {

            @Override

            public ShortcutInfo get() {

                si.updateFromDeepShortcutInfo(info, mApp.getContext());

                si.iconBitmap = LauncherIcons.createShortcutIcon(info, mApp.getContext());

                return si;

            }

        });

    }



    /**

     * Utility method to update a shortcut on the background thread.

     */

src/com/android/launcher3/ShortcutInfo.java

+0 −44
Original line number Diff line number Diff line
@@ -17,21 +17,13 @@ 
package com.android.launcher3;



import android.annotation.TargetApi;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.graphics.Bitmap;

import android.graphics.drawable.Drawable;

import android.os.Build;

import android.os.Process;

import android.os.UserHandle;

import android.text.TextUtils;



import com.android.launcher3.LauncherSettings.Favorites;

import com.android.launcher3.compat.UserManagerCompat;

import com.android.launcher3.graphics.LauncherIcons;

import com.android.launcher3.model.PackageItemInfo;

import com.android.launcher3.shortcuts.DeepShortcutManager;

import com.android.launcher3.shortcuts.ShortcutInfoCompat;

import com.android.launcher3.util.ContentWriter;
@@ -225,42 +217,6 @@ public class ShortcutInfo extends ItemInfoWithIcon { 
            isDisabled |= FLAG_DISABLED_BY_PUBLISHER;

        }

        disabledMessage = shortcutInfo.getDisabledMessage();



        // TODO: Use cache for this

        LauncherAppState launcherAppState = LauncherAppState.getInstance(context);

        Drawable unbadgedDrawable = DeepShortcutManager.getInstance(context)

                .getShortcutIconDrawable(shortcutInfo,

                        launcherAppState.getInvariantDeviceProfile().fillResIconDpi);



        IconCache cache = launcherAppState.getIconCache();

        Bitmap unbadgedBitmap = unbadgedDrawable == null

                ? cache.getDefaultIcon(Process.myUserHandle())

                : LauncherIcons.createScaledBitmapWithoutShadow(unbadgedDrawable, context);

        iconBitmap = getBadgedIcon(unbadgedBitmap, shortcutInfo, cache, context);

    }



    protected Bitmap getBadgedIcon(Bitmap unbadgedBitmap, ShortcutInfoCompat shortcutInfo,

            IconCache cache, Context context) {

        unbadgedBitmap = LauncherIcons.addShadowToIcon(unbadgedBitmap, context);



        final Bitmap badgeBitmap;

        ComponentName cn = shortcutInfo.getActivity();

        if (cn != null) {

            // Get the app info for the source activity.

            AppInfo appInfo = new AppInfo();

            appInfo.user = user;

            appInfo.componentName = cn;

            appInfo.intent = new Intent(Intent.ACTION_MAIN)

                    .addCategory(Intent.CATEGORY_LAUNCHER)

                    .setComponent(cn);

            cache.getTitleAndIcon(appInfo, false);

            badgeBitmap = appInfo.iconBitmap;

        } else {

            PackageItemInfo pkgInfo = new PackageItemInfo(shortcutInfo.getPackage());

            cache.getTitleAndIconForApp(pkgInfo, false);

            badgeBitmap = pkgInfo.iconBitmap;

        }

        return LauncherIcons.badgeWithBitmap(unbadgedBitmap, badgeBitmap, context);

    }



    /** Returns the ShortcutInfo id associated with the deep shortcut. */

src/com/android/launcher3/graphics/LauncherIcons.java

+47 −0
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ 


package com.android.launcher3.graphics;



import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.Intent.ShortcutIconResource;

import android.content.pm.PackageManager;

import android.content.res.Resources;
@@ -32,11 +34,16 @@ import android.graphics.drawable.PaintDrawable; 
import android.os.Process;

import android.os.UserHandle;



import com.android.launcher3.AppInfo;

import com.android.launcher3.IconCache;

import com.android.launcher3.LauncherAppState;

import com.android.launcher3.R;

import com.android.launcher3.Utilities;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.config.ProviderConfig;

import com.android.launcher3.model.PackageItemInfo;

import com.android.launcher3.shortcuts.DeepShortcutManager;

import com.android.launcher3.shortcuts.ShortcutInfoCompat;



import java.lang.reflect.Method;
@@ -230,6 +237,46 @@ public class LauncherIcons { 
        }

    }



    public static Bitmap createShortcutIcon(ShortcutInfoCompat shortcutInfo, Context context) {

        return createShortcutIcon(shortcutInfo, context, true /* badged */);

    }



    public static Bitmap createShortcutIcon(ShortcutInfoCompat shortcutInfo, Context context,

            boolean badged) {

        LauncherAppState app = LauncherAppState.getInstance(context);

        Drawable unbadgedDrawable = DeepShortcutManager.getInstance(context)

                .getShortcutIconDrawable(shortcutInfo,

                        app.getInvariantDeviceProfile().fillResIconDpi);

        IconCache cache = app.getIconCache();

        Bitmap unbadgedBitmap = unbadgedDrawable == null

                ? cache.getDefaultIcon(Process.myUserHandle())

                : LauncherIcons.createScaledBitmapWithoutShadow(unbadgedDrawable, context);



        if (!badged) {

            return unbadgedBitmap;

        }

        unbadgedBitmap = LauncherIcons.addShadowToIcon(unbadgedBitmap, context);



        final Bitmap badgeBitmap;

        ComponentName cn = shortcutInfo.getActivity();

        if (cn != null) {

            // Get the app info for the source activity.

            AppInfo appInfo = new AppInfo();

            appInfo.user = shortcutInfo.getUserHandle();

            appInfo.componentName = cn;

            appInfo.intent = new Intent(Intent.ACTION_MAIN)

                    .addCategory(Intent.CATEGORY_LAUNCHER)

                    .setComponent(cn);

            cache.getTitleAndIcon(appInfo, false);

            badgeBitmap = appInfo.iconBitmap;

        } else {

            PackageItemInfo pkgInfo = new PackageItemInfo(shortcutInfo.getPackage());

            cache.getTitleAndIconForApp(pkgInfo, false);

            badgeBitmap = pkgInfo.iconBitmap;

        }

        return badgeWithBitmap(unbadgedBitmap, badgeBitmap, context);

    }



    /**

     * An extension of {@link BitmapDrawable} which returns the bitmap pixel size as intrinsic size.

     * This allows the badging to be done based on the action bitmap size rather than

src/com/android/launcher3/model/ShortcutsChangedTask.java

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import com.android.launcher3.LauncherAppState; 
import com.android.launcher3.LauncherModel;

import com.android.launcher3.LauncherSettings;

import com.android.launcher3.ShortcutInfo;

import com.android.launcher3.graphics.LauncherIcons;

import com.android.launcher3.shortcuts.DeepShortcutManager;

import com.android.launcher3.shortcuts.ShortcutInfoCompat;

import com.android.launcher3.util.MultiHashMap;
@@ -87,6 +88,8 @@ public class ShortcutsChangedTask extends ExtendedModelTask { 
                }

                for (ShortcutInfo shortcutInfo : shortcutInfos) {

                    shortcutInfo.updateFromDeepShortcutInfo(fullDetails, context);

                    shortcutInfo.iconBitmap =

                            LauncherIcons.createShortcutIcon(fullDetails, context);

                    updatedShortcutInfos.add(shortcutInfo);

                }

            }