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

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

Merge "Updating IconProvider API to use a single API to load icons" into main

parents 04484049 a1cebfa0

quickstep/src/com/android/quickstep/TaskIconCache.java

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ public class TaskIconCache implements TaskIconDataSource, DisplayInfoChangeListe 
        synchronized (mDefaultIcons) {

            if (mDefaultIconBase == null) {

                try (BaseIconFactory bif = getIconFactory()) {

                    mDefaultIconBase = bif.makeDefaultIcon();

                    mDefaultIconBase = bif.makeDefaultIcon(mIconProvider);

                }

            }

src/com/android/launcher3/Utilities.java

+1 −2
Original line number Diff line number Diff line
@@ -626,8 +626,7 @@ public final class Utilities { 
            if (activityInfo == null) {

                return null;

            }

            mainIcon = appState.getIconProvider().getIcon(

                    activityInfo, appState.getInvariantDeviceProfile().fillResIconDpi);

            mainIcon = appState.getIconCache().getFullResIcon(activityInfo.getActivityInfo());

        } else if (info.itemType == LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT) {

            List<ShortcutInfo> siList = ShortcutKey.fromItemInfo(info)

                    .buildRequest(context)

src/com/android/launcher3/icons/IconCache.java

+0 −5
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import android.content.pm.PackageManager.NameNotFoundException; 
import android.content.pm.ShortcutInfo;

import android.database.Cursor;

import android.database.sqlite.SQLiteException;

import android.graphics.drawable.Drawable;

import android.os.Looper;

import android.os.Process;

import android.os.Trace;
@@ -589,10 +588,6 @@ public class IconCache extends BaseIconCache { 
        info.bitmap = packageEntry.bitmap;

    }



    public Drawable getFullResIcon(LauncherActivityInfo info) {

        return mIconProvider.getIcon(info, mIconDpi);

    }



    public void updateSessionCache(PackageUserKey key, PackageInstaller.SessionInfo info) {

        cachePackageInstallInfo(key.mPackageName, key.mUser, info.getAppIcon(),

                info.getAppLabel());

src/com/android/launcher3/pm/ShortcutConfigActivityInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ public abstract class ShortcutConfigActivityInfo implements ComponentWithLabelAn 


        @Override

        public Drawable getFullResIcon(IconCache cache) {

            return cache.getFullResIcon(mInfo);

            return cache.getFullResIcon(mInfo.getActivityInfo());

        }



        @Override

src/com/android/launcher3/widget/DatabaseWidgetPreviewLoader.java

+2 −2
Original line number Diff line number Diff line
@@ -213,8 +213,8 @@ public class DatabaseWidgetPreviewLoader { 


                // Draw icon in the center.

                try {

                    Drawable icon = LauncherAppState.getInstance(mContext).getIconCache()

                            .getFullResIcon(info.provider.getPackageName(), info.icon);

                    Drawable icon = info.getFullResIcon(

                            LauncherAppState.getInstance(mContext).getIconCache());

                    if (icon != null) {

                        int appIconSize = dp.iconSizePx;

                        int iconSize = (int) Math.min(appIconSize * scale,