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

Commit d298effd authored by Jeremy Sim's avatar Jeremy Sim Committed by Vinit Nayak
Browse files

Show veil over main app when splitting from fullscreen 

This CL removes the parallax animation and activates a veil on the main app when animating a "launch adjacent" launch.

Fixes: 307490004
Test: Launch an adjacent task from Chrome or Gmail
Flag: None
Change-Id: I43dadb7d8fd777196375d168a53f114ae22e51ab
Merged-In: I43dadb7d8fd777196375d168a53f114ae22e51ab
parent 256196a1

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

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ public class DividerView extends FrameLayout implements View.OnTouchListener { 
                if (mMoving) {

                    final int position = mSplitLayout.getDividePosition() + touchPos - mStartPos;

                    mLastDraggingPosition = position;

                    mSplitLayout.updateDivideBounds(position);

                    mSplitLayout.updateDivideBounds(position, true /* shouldUseParallaxEffect */);

                }

                break;

            case MotionEvent.ACTION_UP:

libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitDecorManager.java

+37 −17
Original line number Diff line number Diff line
@@ -56,7 +56,13 @@ import com.android.wm.shell.common.SurfaceUtils; 
import java.util.function.Consumer;



/**

 * Handles split decor like showing resizing hint for a specific split.

 * Handles additional layers over a running task in a split pair, for example showing a veil with an

 * app icon when the task is being resized (usually to hide weird layouts while the app is being

 * stretched). One SplitDecorManager is initialized on each window.

 * <br>

 * Currently, we show a veil when:

 *  a) Task is resizing down from a fullscreen window.

 *  b) Task is being stretched past its original bounds.

 */

public class SplitDecorManager extends WindowlessWindowManager {

    private static final String TAG = SplitDecorManager.class.getSimpleName();
@@ -77,7 +83,11 @@ public class SplitDecorManager extends WindowlessWindowManager { 


    private boolean mShown;

    private boolean mIsResizing;

    private final Rect mOldBounds = new Rect();

    /** The original bounds of the main task, captured at the beginning of a resize transition. */

    private final Rect mOldMainBounds = new Rect();

    /** The original bounds of the side task, captured at the beginning of a resize transition. */

    private final Rect mOldSideBounds = new Rect();

    /** The current bounds of the main task, mid-resize. */

    private final Rect mResizingBounds = new Rect();

    private final Rect mTempRect = new Rect();

    private ValueAnimator mFadeAnimator;
@@ -184,7 +194,8 @@ public class SplitDecorManager extends WindowlessWindowManager { 
        mResizingIconView = null;

        mIsResizing = false;

        mShown = false;

        mOldBounds.setEmpty();

        mOldMainBounds.setEmpty();

        mOldSideBounds.setEmpty();

        mResizingBounds.setEmpty();

    }
@@ -198,15 +209,23 @@ public class SplitDecorManager extends WindowlessWindowManager { 


        if (!mIsResizing) {

            mIsResizing = true;

            mOldBounds.set(newBounds);

            mOldMainBounds.set(newBounds);

            mOldSideBounds.set(sideBounds);

        }

        mResizingBounds.set(newBounds);

        mOffsetX = offsetX;

        mOffsetY = offsetY;



        final boolean show =

                newBounds.width() > mOldBounds.width() || newBounds.height() > mOldBounds.height();

        final boolean update = show != mShown;

        // Show a veil when:

        //  a) Task is resizing down from a fullscreen window.

        //  b) Task is being stretched past its original bounds.

        final boolean isResizingDownFromFullscreen =

                mOldSideBounds.width() <= 1 || mOldSideBounds.height() <= 1;

        final boolean isStretchingPastOriginalBounds =

                newBounds.width() > mOldMainBounds.width()

                        || newBounds.height() > mOldMainBounds.height();

        final boolean showVeil = isResizingDownFromFullscreen || isStretchingPastOriginalBounds;

        final boolean update = showVeil != mShown;

        if (update && mFadeAnimator != null && mFadeAnimator.isRunning()) {

            // If we need to animate and animator still running, cancel it before we ensure both

            // background and icon surfaces are non null for next animation.
@@ -222,8 +241,8 @@ public class SplitDecorManager extends WindowlessWindowManager { 


        if (mGapBackgroundLeash == null && !immediately) {

            final boolean isLandscape = newBounds.height() == sideBounds.height();

            final int left = isLandscape ? mOldBounds.width() : 0;

            final int top = isLandscape ? 0 : mOldBounds.height();

            final int left = isLandscape ? mOldMainBounds.width() : 0;

            final int top = isLandscape ? 0 : mOldMainBounds.height();

            mGapBackgroundLeash = SurfaceUtils.makeColorLayer(mHostLeash,

                    GAP_BACKGROUND_SURFACE_NAME, mSurfaceSession);

            // Fill up another side bounds area.
@@ -251,12 +270,12 @@ public class SplitDecorManager extends WindowlessWindowManager { 


        if (update) {

            if (immediately) {

                t.setVisibility(mBackgroundLeash, show);

                t.setVisibility(mIconLeash, show);

                t.setVisibility(mBackgroundLeash, showVeil);

                t.setVisibility(mIconLeash, showVeil);

            } else {

                startFadeAnimation(show, false, null);

                startFadeAnimation(showVeil, false, null);

            }

            mShown = show;

            mShown = showVeil;

        }

    }
@@ -309,7 +328,8 @@ public class SplitDecorManager extends WindowlessWindowManager { 
        mIsResizing = false;

        mOffsetX = 0;

        mOffsetY = 0;

        mOldBounds.setEmpty();

        mOldMainBounds.setEmpty();

        mOldSideBounds.setEmpty();

        mResizingBounds.setEmpty();

        if (mFadeAnimator != null && mFadeAnimator.isRunning()) {

            if (!mShown) {
@@ -346,14 +366,14 @@ public class SplitDecorManager extends WindowlessWindowManager { 


    /** Screenshot host leash and attach on it if meet some conditions */

    public void screenshotIfNeeded(SurfaceControl.Transaction t) {

        if (!mShown && mIsResizing && !mOldBounds.equals(mResizingBounds)) {

        if (!mShown && mIsResizing && !mOldMainBounds.equals(mResizingBounds)) {

            if (mScreenshotAnimator != null && mScreenshotAnimator.isRunning()) {

                mScreenshotAnimator.cancel();

            } else if (mScreenshot != null) {

                t.remove(mScreenshot);

            }



            mTempRect.set(mOldBounds);

            mTempRect.set(mOldMainBounds);

            mTempRect.offsetTo(0, 0);

            mScreenshot = ScreenshotUtils.takeScreenshot(t, mHostLeash, mTempRect,

                    Integer.MAX_VALUE - 1);
@@ -364,7 +384,7 @@ public class SplitDecorManager extends WindowlessWindowManager { 
    public void setScreenshotIfNeeded(SurfaceControl screenshot, SurfaceControl.Transaction t) {

        if (screenshot == null || !screenshot.isValid()) return;



        if (!mShown && mIsResizing && !mOldBounds.equals(mResizingBounds)) {

        if (!mShown && mIsResizing && !mOldMainBounds.equals(mResizingBounds)) {

            if (mScreenshotAnimator != null && mScreenshotAnimator.isRunning()) {

                mScreenshotAnimator.cancel();

            } else if (mScreenshot != null) {

libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java

+7 −4
Original line number Diff line number Diff line
@@ -496,10 +496,10 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
     * Updates bounds with the passing position. Usually used to update recording bounds while

     * performing animation or dragging divider bar to resize the splits.

     */

    void updateDivideBounds(int position) {

    void updateDivideBounds(int position, boolean shouldUseParallaxEffect) {

        updateBounds(position);

        mSplitLayoutHandler.onLayoutSizeChanging(this, mSurfaceEffectPolicy.mParallaxOffset.x,

                mSurfaceEffectPolicy.mParallaxOffset.y);

                mSurfaceEffectPolicy.mParallaxOffset.y, shouldUseParallaxEffect);

    }



    void setDividePosition(int position, boolean applyLayoutChange) {
@@ -647,7 +647,9 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
                .setDuration(duration);

        mDividerFlingAnimator.setInterpolator(Interpolators.FAST_OUT_SLOW_IN);

        mDividerFlingAnimator.addUpdateListener(

                animation -> updateDivideBounds((int) animation.getAnimatedValue()));

                animation -> updateDivideBounds(

                        (int) animation.getAnimatedValue(), false /* shouldUseParallaxEffect */)

        );

        mDividerFlingAnimator.addListener(new AnimatorListenerAdapter() {

            @Override

            public void onAnimationEnd(Animator animation) {
@@ -897,7 +899,8 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
         * @see #applySurfaceChanges(SurfaceControl.Transaction, SurfaceControl, SurfaceControl,

         * SurfaceControl, SurfaceControl, boolean)

         */

        void onLayoutSizeChanging(SplitLayout layout, int offsetX, int offsetY);

        void onLayoutSizeChanging(SplitLayout layout, int offsetX, int offsetY,

                boolean shouldUseParallaxEffect);



        /**

         * Calls when finish resizing the split bounds.

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

+3 −2
Original line number Diff line number Diff line
@@ -2352,10 +2352,11 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
    }



    @Override

    public void onLayoutSizeChanging(SplitLayout layout, int offsetX, int offsetY) {

    public void onLayoutSizeChanging(SplitLayout layout, int offsetX, int offsetY,

            boolean shouldUseParallaxEffect) {

        final SurfaceControl.Transaction t = mTransactionPool.acquire();

        t.setFrameTimelineVsync(Choreographer.getInstance().getVsyncId());

        updateSurfaceBounds(layout, t, true /* applyResizingOffset */);

        updateSurfaceBounds(layout, t, shouldUseParallaxEffect);

        getMainStageBounds(mTempRect1);

        getSideStageBounds(mTempRect2);

        mMainStage.onResizing(mTempRect1, mTempRect2, t, offsetX, offsetY, mShowDecorImmediately);

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/split/SplitLayoutTests.java

+3 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import static com.android.wm.shell.common.split.SplitScreenConstants.SNAP_TO_STA 
import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.never;
@@ -115,9 +116,9 @@ public class SplitLayoutTests extends ShellTestCase { 


    @Test

    public void testUpdateDivideBounds() {

        mSplitLayout.updateDivideBounds(anyInt());

        mSplitLayout.updateDivideBounds(anyInt(), anyBoolean());

        verify(mSplitLayoutHandler).onLayoutSizeChanging(any(SplitLayout.class), anyInt(),

                anyInt());

                anyInt(), anyBoolean());

    }



    @Test