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

Commit dea57998 authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Android (Google) Code Review
Browse files

Merge "Setup make icon-loader library Bug: 115891474" into ub-launcher3-master

parents 44347633 cda96a5b

Android.bp

+20 −0
Original line number Diff line number Diff line
@@ -28,3 +28,23 @@ java_library_static { 
    ],

    platform_apis: true,

}





android_library {

    name: "icon-loader",

    sdk_version: "28",

    static_libs: [

        "androidx.core_core",

    ],

    resource_dirs: [

        "res",

    ],

    srcs: [

        "src/com/android/launcher3/icons/BaseIconFactory.java",

        "src/com/android/launcher3/icons/BitmapInfo.java",

        "src/com/android/launcher3/icons/IconNormalizer.java",

        "src/com/android/launcher3/icons/FixedScaleDrawable.java",

        "src/com/android/launcher3/icons/ShadowGenerator.java",

        "src/com/android/launcher3/icons/ColorExtractor.java",

    ],

}

src/com/android/launcher3/InstallShortcutReceiver.java

+3 −3
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ public class InstallShortcutReceiver extends BroadcastReceiver { 
                final LauncherAppState app = LauncherAppState.getInstance(mContext);

                // Set default values until proper values is loaded.

                appInfo.title = "";

                app.getIconCache().getDefaultIcon(user).applyTo(appInfo);

                appInfo.applyFrom(app.getIconCache().getDefaultIcon(user));

                final ShortcutInfo si = appInfo.makeShortcut();

                if (Looper.myLooper() == LauncherModel.getWorkerLooper()) {

                    app.getIconCache().getTitleAndIcon(si, activityInfo, false /* useLowResIcon */);
@@ -495,7 +495,7 @@ public class InstallShortcutReceiver extends BroadcastReceiver { 
            } else if (shortcutInfo != null) {

                ShortcutInfo si = new ShortcutInfo(shortcutInfo, mContext);

                LauncherIcons li = LauncherIcons.obtain(mContext);

                li.createShortcutIcon(shortcutInfo).applyTo(si);

                si.applyFrom(li.createShortcutIcon(shortcutInfo));

                li.recycle();

                return Pair.create((ItemInfo) si, (Object) shortcutInfo);

            } else if (providerInfo != null) {
@@ -656,7 +656,7 @@ public class InstallShortcutReceiver extends BroadcastReceiver { 
        if (iconInfo == null) {

            iconInfo = app.getIconCache().getDefaultIcon(info.user);

        }

        iconInfo.applyTo(info);

        info.applyFrom(iconInfo);



        info.title = Utilities.trim(name);

        info.contentDescription = UserManagerCompat.getInstance(app.getContext())

src/com/android/launcher3/ItemInfoWithIcon.java

+8 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ import static com.android.launcher3.icons.BitmapInfo.LOW_RES_ICON; 


import android.graphics.Bitmap;



import com.android.launcher3.icons.BitmapInfo;



/**

 * Represents an ItemInfo which also holds an icon.

 */
@@ -118,4 +120,10 @@ public abstract class ItemInfoWithIcon extends ItemInfo { 
    public boolean usingLowResIcon() {

        return iconBitmap == LOW_RES_ICON;

    }



    public void applyFrom(BitmapInfo info) {

        iconBitmap = info.icon;

        iconColor = info.color;

    }



}

src/com/android/launcher3/LauncherModel.java

+1 −1
Original line number Diff line number Diff line
@@ -657,7 +657,7 @@ public class LauncherModel extends BroadcastReceiver 
        updateAndBindShortcutInfo(() -> {

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

            LauncherIcons li = LauncherIcons.obtain(mApp.getContext());

            li.createShortcutIcon(info).applyTo(si);

            si.applyFrom(li.createShortcutIcon(info));

            li.recycle();

            return si;

        });

src/com/android/launcher3/compat/LauncherAppsCompatVO.java

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ public class LauncherAppsCompatVO extends LauncherAppsCompatVL { 
            ShortcutInfo info = new ShortcutInfo(compat, context);

            // Apply the unbadged icon and fetch the actual icon asynchronously.

            LauncherIcons li = LauncherIcons.obtain(context);

            li.createShortcutIcon(compat, false /* badged */).applyTo(info);

            info.applyFrom(li.createShortcutIcon(compat, false /* badged */));

            li.recycle();

            LauncherAppState.getInstance(context).getModel()

                    .updateAndBindShortcutInfo(info, compat);