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

Commit 1fafd9ad authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove divider view when exiting splitscreen" into rvc-dev am: 3a6ec37a 

Change-Id: I7cbc233fca8687eba37c3127f9d13fe3c9e60c19
parents d42cef58 3a6ec37a

core/java/android/view/SurfaceControlViewHost.java

+0 −8
Original line number Diff line number Diff line
@@ -275,12 +275,4 @@ public class SurfaceControlViewHost { 
        // ViewRoot will release mSurfaceControl for us.

        mViewRoot.die(false /* immediate */);

    }



    /**

     * Tell this viewroot to clean itself up.

     * @hide

     */

    public void die() {

        mViewRoot.die(false /* immediate */);

    }

}

packages/SystemUI/shared/src/com/android/systemui/shared/system/SurfaceViewRequestReceiver.java

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ public class SurfaceViewRequestReceiver { 
     */

    public void onReceive(Context context, Bundle bundle, View view, Size viewSize) {

        if (mSurfaceControlViewHost != null) {

            mSurfaceControlViewHost.die();

            mSurfaceControlViewHost.release();

        }



        SurfaceControl surfaceControl = SurfaceViewRequestUtils.getSurfaceControl(bundle);

packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java

+8 −7
Original line number Diff line number Diff line
@@ -592,14 +592,12 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks, 
        removeDivider();

        addDivider(configuration);



        if (mView != null) {

        if (mMinimized) {

            mView.setMinimizedDockStack(true, mHomeStackResizable);

            updateTouchable();

        }

        mView.setHidden(isDividerHidden);

    }

    }



    void onTaskVanished() {

        mHandler.post(this::removeDivider);
@@ -610,7 +608,7 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks, 
                mContext.getDisplayId()).getResources().getConfiguration()));

    }



    void updateVisibility(final boolean visible) {

    private void updateVisibility(final boolean visible) {

        if (DEBUG) Slog.d(TAG, "Updating visibility " + mVisible + "->" + visible);

        if (mVisible != visible) {

            mVisible = visible;
@@ -639,6 +637,7 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks, 
    void onSplitDismissed() {

        mMinimized = false;

        updateVisibility(false /* visible */);

        removeDivider();

    }



    /** Switch to minimized state if appropriate */
@@ -788,6 +787,8 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks, 
    }



    void startEnterSplit() {

        update(mDisplayController.getDisplayContext(

                mContext.getDisplayId()).getResources().getConfiguration());

        // Set resizable directly here because applyEnterSplit already resizes home stack.

        mHomeStackResizable = WindowManagerProxy.applyEnterSplit(mSplits, mSplitLayout);

    }

packages/SystemUI/src/com/android/systemui/wm/SystemWindows.java

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ public class SystemWindows { 
     */

    public void removeView(View view) {

        SurfaceControlViewHost root = mViewRoots.remove(view);

        root.die();

        root.release();

    }



    /**

services/core/java/com/android/server/wm/WindowManagerService.java

+1 −0
Original line number Diff line number Diff line
@@ -8082,6 +8082,7 @@ public class WindowManagerService extends IWindowManager.Stub 
        t.setInputWindowInfo(surface, h);

        t.apply();

        t.close();

        surface.release();

    }



    /**