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

Commit 6482c916 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Reset the static preloaded icon result once launcher is hidden" into... 

Merge "Reset the static preloaded icon result once launcher is hidden" into udc-dev am: 7cd60859 am: f2433f39

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23697218



Change-Id: I63ea52de92f342eebac6e7b796e4aded305e0a16
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 883ce5f1 f2433f39

src/com/android/launcher3/Launcher.java

+1 −0
Original line number Diff line number Diff line
@@ -1065,6 +1065,7 @@ public class Launcher extends StatefulActivity<LauncherState> 
        logStopAndResume(false /* isResume */);

        mAppWidgetHolder.setActivityStarted(false);

        NotificationListener.removeNotificationsChangedListener(getPopupDataProvider());

        FloatingIconView.resetIconLoadResult();

    }



    @Override

src/com/android/launcher3/views/FloatingIconView.java

+8 −1
Original line number Diff line number Diff line
@@ -571,6 +571,13 @@ public class FloatingIconView extends FrameLayout implements 
        return result;

    }



    /**

     * Resets the static icon load result used for preloading the icon for a launching app.

     */

    public static void resetIconLoadResult() {

        sIconLoadResult = null;

    }



    /**

     * Creates a floating icon view for {@param originalView}.

     * @param originalView The view to copy
@@ -608,7 +615,7 @@ public class FloatingIconView extends FrameLayout implements 
            }

            view.setOriginalDrawableBackground(view.mIconLoadResult.btvDrawable);

        }

        sIconLoadResult = null;

        resetIconLoadResult();



        // Match the position of the original view.

        view.matchPositionOf(launcher, originalView, isOpening, positionOut);