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

Commit 0687cb5e authored by Tony Huang's avatar Tony Huang Committed by Automerger Merge Worker
Browse files

Merge "Reduce flicker when resize animation" into tm-dev am: 86aff453 am: 3114acff 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17518063



Change-Id: I649cc63eb0f08fe8d2034eeaacea0271198ba3dd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8665e2e7 3114acff

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

+15 −1
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
    private boolean mShouldUpdateRecents;

    private boolean mExitSplitScreenOnHide;

    private boolean mIsDividerRemoteAnimating;

    private boolean mResizingSplits;



    /** The target stage to dismiss to when unlock after folded. */

    @StageType
@@ -1093,10 +1094,11 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler, 


    @Override

    public void onSnappedToDismiss(boolean bottomOrRight) {

        setResizingSplits(false /* resizing */);



        final boolean mainStageToTop =

                bottomOrRight ? mSideStagePosition == SPLIT_POSITION_BOTTOM_OR_RIGHT

                        : mSideStagePosition == SPLIT_POSITION_TOP_OR_LEFT;



        if (!ENABLE_SHELL_TRANSITIONS) {

            exitSplitScreen(mainStageToTop ? mMainStage : mSideStage, EXIT_REASON_DRAG_DIVIDER);

            return;
@@ -1125,6 +1127,7 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
    @Override

    public void onLayoutSizeChanging(SplitLayout layout) {

        mSyncQueue.runInSync(t -> {

            setResizingSplits(true /* resizing */);

            updateSurfaceBounds(layout, t);

            mMainStage.onResizing(getMainStageBounds(), t);

            mSideStage.onResizing(getSideStageBounds(), t);
@@ -1138,6 +1141,7 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        updateUnfoldBounds();

        mSyncQueue.queue(wct);

        mSyncQueue.runInSync(t -> {

            setResizingSplits(false /* resizing */);

            updateSurfaceBounds(layout, t);

            mMainStage.onResized(t);

            mSideStage.onResized(t);
@@ -1179,6 +1183,16 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                bottomRightStage.mRootLeash, topLeftStage.mDimLayer, bottomRightStage.mDimLayer);

    }



    void setResizingSplits(boolean resizing) {

        if (resizing == mResizingSplits) return;

        try {

            ActivityTaskManager.getService().setSplitScreenResizing(resizing);

            mResizingSplits = resizing;

        } catch (RemoteException e) {

            Slog.w(TAG, "Error calling setSplitScreenResizing", e);

        }

    }



    @Override

    public int getSplitItemPosition(WindowContainerToken token) {

        if (token == null) {