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

Commit 2bf3f37f authored by Hyunyoung Song's avatar Hyunyoung Song
Browse files

Fix icon shape refresh for widgets list / legacy shortcut black bg issue 

Bug: 118085499
Change-Id: Ifc3c711815567f40f109e95bcb76c01f23b4a3a2
parent 9c436be5

iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java

+1 −5
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ public class BaseIconFactory implements AutoCloseable { 


        mCanvas = new Canvas();

        mCanvas.setDrawFilter(new PaintFlagsDrawFilter(DITHER_FLAG, FILTER_BITMAP_FLAG));

        clear();

    }



    protected void clear() {
@@ -113,11 +114,6 @@ public class BaseIconFactory implements AutoCloseable { 
        return createBadgedIconBitmap(icon, user, shrinkNonAdaptiveIcons, false, null);

    }



    public BitmapInfo createBadgedIconBitmap(Drawable icon, UserHandle user,

            boolean shrinkNonAdaptiveIcons, boolean isInstantApp) {

        return createBadgedIconBitmap(icon, user, shrinkNonAdaptiveIcons, isInstantApp, null);

    }



    public BitmapInfo createBadgedIconBitmap(Drawable icon, UserHandle user,

            int iconAppTargetSdk) {

        return createBadgedIconBitmap(icon, user, iconAppTargetSdk, false);

src/com/android/launcher3/LauncherAppState.java

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ public class LauncherAppState { 
        if ((changeFlags & CHANGE_FLAG_ICON_PARAMS) != 0) {

            LauncherIcons.clearPool();

            mIconCache.updateIconParams(idp.fillResIconDpi, idp.iconBitmapSize);

            mWidgetCache.refresh();

        }



        mModel.forceReload();

src/com/android/launcher3/WidgetPreviewLoader.java

+8 −4
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.graphics.drawable.Drawable; 
import android.os.AsyncTask;

import android.os.CancellationSignal;

import android.os.Handler;

import android.os.Process;

import android.os.UserHandle;

import android.util.Log;

import android.util.LongSparseArray;
@@ -73,7 +74,6 @@ public class WidgetPreviewLoader { 
    private final Context mContext;

    private final IconCache mIconCache;

    private final UserManagerCompat mUserManager;

    private final AppWidgetManagerCompat mWidgetManager;

    private final CacheDb mDb;



    private final MainThreadExecutor mMainThreadExecutor = new MainThreadExecutor();
@@ -82,7 +82,6 @@ public class WidgetPreviewLoader { 
    public WidgetPreviewLoader(Context context, IconCache iconCache) {

        mContext = context;

        mIconCache = iconCache;

        mWidgetManager = AppWidgetManagerCompat.getInstance(context);

        mUserManager = UserManagerCompat.getInstance(context);

        mDb = new CacheDb(context);

        mWorkerHandler = new Handler(LauncherModel.getWorkerLooper());
@@ -107,6 +106,10 @@ public class WidgetPreviewLoader { 
        return signal;

    }



    public void refresh() {

        mDb.clear();



    }

    /**

     * The DB holds the generated previews for various components. Previews can also have different

     * sizes (landscape vs portrait).
@@ -474,8 +477,9 @@ public class WidgetPreviewLoader { 
        RectF boxRect = drawBoxWithShadow(c, size, size);



        LauncherIcons li = LauncherIcons.obtain(mContext);

        Bitmap icon = li.createScaledBitmapWithoutShadow(

                mutateOnMainThread(info.getFullResIcon(mIconCache)), 0);

        Bitmap icon = li.createBadgedIconBitmap(

                mutateOnMainThread(info.getFullResIcon(mIconCache)),

                Process.myUserHandle(), 0).icon;

        li.recycle();



        Rect src = new Rect(0, 0, icon.getWidth(), icon.getHeight());

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

+0 −5
Original line number Diff line number Diff line
@@ -56,11 +56,6 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch 
        addOnItemTouchListener(this);

    }



    public WidgetsRecyclerView(Context context, AttributeSet attrs, int defStyleAttr,

            int defStyleRes) {

        this(context, attrs, defStyleAttr);

    }



    @Override

    protected void onFinishInflate() {

        super.onFinishInflate();