Merge "Fix cropped pre-archived app icons by converting to a fixed Adaptive Icon" into main

import android.content.ComponentName;

import android.content.Context;

import android.content.pm.LauncherActivityInfo;

import android.os.Build;

import android.os.UserHandle;

import androidx.annotation.NonNull;

import com.android.launcher3.Flags;

import com.android.launcher3.LauncherAppState;

import com.android.launcher3.R;

import com.android.launcher3.icons.BaseIconFactory.IconOptions;

    @Override

    public BitmapInfo loadIcon(@NonNull Context context, @NonNull LauncherActivityInfo object) {

        try (LauncherIcons li = LauncherIcons.obtain(context)) {

            return li.createBadgedIconBitmap(LauncherAppState.getInstance(context)

                            .getIconProvider().getIcon(object, li.mFillResIconDpi),

                    new IconOptions().setUser(object.getUser()));

            IconOptions iconOptions = new IconOptions().setUser(object.getUser());

            iconOptions.mIsArchived = Flags.useNewIconForArchivedApps()

                && Build.VERSION.SDK_INT >= 35

                && object.getActivityInfo().isArchived;

            return li.createBadgedIconBitmap(

                    LauncherAppState.getInstance(context)

                        .getIconProvider()

                        .getIcon(object, li.mFillResIconDpi),

                    iconOptions

            );

        }

    }

}