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

Commit afddf887 authored by Qijing Yao's avatar Qijing Yao Committed by Android (Google) Code Review
Browse files

Merge "Unregister DisplayWindowListener when window closed" into main

parents 30185021 b50ba0c4

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/FluidResizeTaskPositioner.java

+3 −0
Original line number Diff line number Diff line
@@ -173,6 +173,9 @@ class FluidResizeTaskPositioner implements TaskPositioner, Transitions.Transitio 
        return new Rect(mRepositionTaskBounds);

    }



    @Override

    public void close() {}



    private boolean isResizing() {

        return (mCtrlType & CTRL_TYPE_TOP) != 0 || (mCtrlType & CTRL_TYPE_BOTTOM) != 0

                || (mCtrlType & CTRL_TYPE_LEFT) != 0 || (mCtrlType & CTRL_TYPE_RIGHT) != 0;

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/MultiDisplayVeiledResizeTaskPositioner.kt

+4 −0
Original line number Diff line number Diff line
@@ -294,6 +294,10 @@ class MultiDisplayVeiledResizeTaskPositioner( 
        return Rect(repositionTaskBounds)

    }



    override fun close() {

        displayController.removeDisplayWindowListener(this)

    }



    private fun resetVeilIfVisible() {

        if (isResizingOrAnimatingResize) {

            desktopWindowDecoration.hideResizeVeil()

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/TaskDragResizer.java

+6 −0
Original line number Diff line number Diff line
@@ -41,4 +41,10 @@ public interface TaskDragResizer { 
     */

    void removeDragEventListener(

            DragPositioningCallbackUtility.DragEventListener dragEventListener);



    /**

     * Releases any resources associated with this TaskDragResizer. This should be called when the

     * associated window is closed.

     */

    void close();

}

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/VeiledResizeTaskPositioner.java

+3 −0
Original line number Diff line number Diff line
@@ -205,6 +205,9 @@ public class VeiledResizeTaskPositioner implements TaskPositioner, Transitions.T 
        return new Rect(mRepositionTaskBounds);

    }



    @Override

    public void close() {}



    private boolean isResizing() {

        return (mCtrlType & CTRL_TYPE_TOP) != 0 || (mCtrlType & CTRL_TYPE_BOTTOM) != 0

                || (mCtrlType & CTRL_TYPE_LEFT) != 0 || (mCtrlType & CTRL_TYPE_RIGHT) != 0;

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java

+3 −0
Original line number Diff line number Diff line
@@ -699,6 +699,9 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> 
    public void close() {

        Trace.beginSection("WindowDecoration#close");

        mDisplayController.removeDisplayWindowListener(mOnDisplaysChangedListener);

        if (mTaskDragResizer != null) {

            mTaskDragResizer.close();

        }

        final WindowContainerTransaction wct = mWindowContainerTransactionSupplier.get();

        releaseViews(wct);

        mTaskOrganizer.applyTransaction(wct);