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

Commit 3d97fdcf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Wait until listeners/end runnable is created before checking icon... 

Merge "Wait until listeners/end runnable is created before checking icon result." into ub-launcher3-qt-future-dev
parents 31bb57db 1dd2e481

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

+8 −5
Original line number Diff line number Diff line
@@ -767,11 +767,6 @@ public class FloatingIconView extends View implements 
        // Match the position of the original view.

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



        // Must be called after matchPositionOf so that we know what size to load.

        if (shouldLoadIcon) {

            view.checkIconResult(originalView, isOpening);

        }



        // We need to add it to the overlay, but keep it invisible until animation starts..

        view.setVisibility(INVISIBLE);

        parent.addView(view);
@@ -798,6 +793,14 @@ public class FloatingIconView extends View implements 
                view.finish(dragLayer);

            }

        };



        // Must be called after matchPositionOf so that we know what size to load.

        // Must be called after the fastFinish listener and end runnable is created so that

        // the icon is not left in a hidden state.

        if (shouldLoadIcon) {

            view.checkIconResult(originalView, isOpening);

        }



        return view;

    }