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

Commit 90cac2cd authored by Jon Miranda's avatar Jon Miranda Committed by Android (Google) Code Review
Browse files

Merge "Init FloatingIconView properties before fetching drawable. & Make sure... 

Merge "Init FloatingIconView properties before fetching drawable. & Make sure properties are reset when recycled." into sc-v2-dev
parents a75f2ce2 35d29438

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

+7 −5
Original line number Diff line number Diff line
@@ -564,6 +564,12 @@ public class FloatingIconView extends FrameLayout implements 
                launcher, parent);

        view.recycle();



        // Init properties before getting the drawable.

        view.mIsVerticalBarLayout = launcher.getDeviceProfile().isVerticalBarLayout();

        view.mIsOpening = isOpening;

        view.mOriginalIcon = originalView;

        view.mPositionOut = positionOut;



        // Get the drawable on the background thread

        boolean shouldLoadIcon = originalView.getTag() instanceof ItemInfo && hideOriginal;

        if (shouldLoadIcon) {
@@ -577,11 +583,6 @@ public class FloatingIconView extends FrameLayout implements 
        }

        sIconLoadResult = null;



        view.mIsVerticalBarLayout = launcher.getDeviceProfile().isVerticalBarLayout();

        view.mIsOpening = isOpening;

        view.mOriginalIcon = originalView;

        view.mPositionOut = positionOut;



        // Match the position of the original view.

        view.matchPositionOf(launcher, originalView, isOpening, positionOut);
@@ -639,6 +640,7 @@ public class FloatingIconView extends FrameLayout implements 
        mLoadIconSignal = null;

        mEndRunnable = null;

        mFinalDrawableBounds.setEmpty();

        mIsOpening = false;

        mPositionOut = null;

        mListenerView.setListener(null);

        mOriginalIcon = null;