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

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

Merge "Remove legacy involveSplitScreen API"

parents 5bbcb644 50d7af97

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/DividerView.java

+0 −4
Original line number Diff line number Diff line
@@ -1319,10 +1319,6 @@ public class DividerView extends FrameLayout implements OnTouchListener, 
                mBackground.getRight(), mBackground.getBottom(), Op.UNION);

    }



    void onDockedFirstAnimationFrame() {

        saveSnapTargetBeforeMinimized(mSplitLayout.getSnapAlgorithm().getMiddleTarget());

    }



    void onDockedTopTask() {

        mState.animateAfterRecentsDrawn = true;

        startDragging(false /* animate */, false /* touching */);

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreen.java

+0 −3
Original line number Diff line number Diff line
@@ -68,9 +68,6 @@ public interface SplitScreen { 
    /** Called when there's a task undocking. */

    void onUndockingTask();



    /** Called when the first docked animation frame rendered. */

    void onDockedFirstAnimationFrame();



    /** Called when top task docked. */

    void onDockedTopTask();

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java

+3 −7
Original line number Diff line number Diff line
@@ -426,13 +426,6 @@ public class SplitScreenController implements SplitScreen, 
        }

    }



    /** Called when the first docked animation frame rendered. */

    public void onDockedFirstAnimationFrame() {

        if (mView != null) {

            mView.onDockedFirstAnimationFrame();

        }

    }



    /** Called when top task docked. */

    public void onDockedTopTask() {

        if (mView != null) {
@@ -502,6 +495,9 @@ public class SplitScreenController implements SplitScreen, 
        mWindowManagerProxy.applyDismissSplit(mSplits, mSplitLayout, true /* dismissOrMaximize */);

        updateVisibility(false /* visible */);

        mMinimized = false;

        // Resets divider bar position to undefined, so new divider bar will apply default position

        // next time entering split mode.

        mDividerState.mRatioPositionBeforeMinimized = 0;

        removeDivider();

        mImePositionProcessor.reset();

    }

packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl

+0 −5
Original line number Diff line number Diff line
@@ -43,11 +43,6 @@ interface ISystemUiProxy { 
     */

    void startScreenPinning(int taskId) = 1;



    /**

     * Notifies SystemUI that split screen has been invoked.

     */

    void onSplitScreenInvoked() = 5;



    /**

     * Notifies SystemUI that Overview is shown.

     */

packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java

+0 −15
Original line number Diff line number Diff line
@@ -232,21 +232,6 @@ public class OverviewProxyService extends CurrentUserTracker implements 
            }

        }



        @Override

        public void onSplitScreenInvoked() {

            if (!verifyCaller("onSplitScreenInvoked")) {

                return;

            }

            long token = Binder.clearCallingIdentity();

            try {

                mSplitScreenOptional.ifPresent(splitScreen -> {

                    splitScreen.onDockedFirstAnimationFrame();

                });

            } finally {

                Binder.restoreCallingIdentity(token);

            }

        }



        @Override

        public void onOverviewShown(boolean fromHome) {

            if (!verifyCaller("onOverviewShown")) {