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

Commit baf1ef55 authored by Jon Miranda's avatar Jon Miranda
Browse files

Revert "Clear all DragView in onSaveInstanceState" 

This reverts commit 14d6771a
to fix bootline regression.

Bug: 210383463
Test: manual
Change-Id: I5a0dadee59bfd6b5a164fd2ca3ecdd1885cb4134
parent bf96683e

src/com/android/launcher3/Launcher.java

+0 −2
Original line number Diff line number Diff line
@@ -1681,8 +1681,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche 
        AbstractFloatingView.closeOpenViews(this, false, TYPE_ALL & ~TYPE_REBIND_SAFE);

        finishAutoCancelActionMode();



        DragView.removeAllViews(this);



        if (mPendingRequestArgs != null) {

            outState.putParcelable(RUNTIME_STATE_PENDING_REQUEST_ARGS, mPendingRequestArgs);

        }

src/com/android/launcher3/dragndrop/DragView.java

+0 −15
Original line number Diff line number Diff line
@@ -564,19 +564,4 @@ public abstract class DragView<T extends Context & ActivityContext> extends Fram 
        iv.setImageDrawable(drawable);

        return iv;

    }



    /**

     * Removes any stray DragView from the DragLayer.

     */

    public static void removeAllViews(ActivityContext activity) {

        BaseDragLayer dragLayer = activity.getDragLayer();

        // Iterate in reverse order. DragView is added later to the dragLayer,

        // and will be one of the last views.

        for (int i = dragLayer.getChildCount() - 1; i >= 0; i--) {

            View child = dragLayer.getChildAt(i);

            if (child instanceof DragView) {

                dragLayer.removeView(child);

            }

        }

    }

}