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

Commit e0ef87d8 authored by Riddle Hsu's avatar Riddle Hsu
Browse files

Toggle dim according to progress of recents animation 

The major problem when running recents animation:
 - Initial: canAffectSystemUiFlags=false by setTransientLaunch
 - Drag the app task a bit: canAffectSystemUiFlags=true
   by setRecentsAppBehindSystemBars
 - Drag the app task to original position to exit recents
   animation: canAffectSystemUiFlags=false
   by setRecentsAppBehindSystemBars

If canAffectSystemUiFlags is not true (default),
DisplayArea#prepareSurface will try to cancel dim. But if there is
a valid window to request dim, it will cause endless animation loop
between applyDim and resetDimStates and the dim is never visible.

The state can be corrected by resetting canAffectSystemUiFlags to
true when the transient(recents) transition is finished.

Also instead of searching canAffectSystemUiFlags on every
prepareSurface, it is more efficient to only check if a dimmer can
request to show according the status of a playing recents transition.
This would also fix ugly animation when swiping a translucent task
to home that the dimmer covers home during entire animation.

Also see:
 Reset dim in legacy: I6e275b778da4cb7aeda3b3483a14f5f9d2796e44
 Set flag with shell: I552eea738aed5566eb897bb9c68507e83ac43e1d

Fix: 286955271
Test: atest TransitionTests#testTransientLaunch

Change-Id: I5843abb925eb2466be34e1dcb96d4cfd83e4dc8a
parent f80ef935

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

+4 −0
Original line number Diff line number Diff line
@@ -178,6 +178,10 @@ class Dimmer { 
        mSurfaceAnimatorStarter = surfaceAnimatorStarter;

    }



    WindowContainer<?> getHost() {

        return mHost;

    }



    private SurfaceControl makeDimLayer() {

        return mHost.makeChildSurface(null)

                .setParent(mHost.getSurfaceControl())

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

+2 −1
Original line number Diff line number Diff line
@@ -790,7 +790,8 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> { 


            // If SystemUI is dragging for recents, we want to reset the dim state so any dim layer

            // on the display level fades out.

            if (forAllTasks(task -> !task.canAffectSystemUiFlags())) {

            if (!mTransitionController.isShellTransitionsEnabled()

                    && forAllTasks(task -> !task.canAffectSystemUiFlags())) {

                mDimmer.resetDimStates();

            }

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

+32 −0
Original line number Diff line number Diff line
@@ -397,6 +397,28 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
        return false;

    }



    boolean canApplyDim(@NonNull Task task) {

        if (mTransientLaunches == null) return true;

        final Dimmer dimmer = task.getDimmer();

        final WindowContainer<?> dimmerHost = dimmer != null ? dimmer.getHost() : null;

        if (dimmerHost == null) return false;

        if (isInTransientHide(dimmerHost)) {

            // The layer of dimmer is inside transient-hide task, then allow to dim.

            return true;

        }

        // The dimmer host of a translucent task can be a display, then it is not in transient-hide.

        for (int i = mTransientLaunches.size() - 1; i >= 0; --i) {

            // The transient task is usually the task of recents/home activity.

            final Task transientTask = mTransientLaunches.keyAt(i).getTask();

            if (transientTask != null && transientTask.canAffectSystemUiFlags()) {

                // It usually means that the recents animation has moved the transient-hide task

                // an noticeable distance, then the display level dimmer should not show.

                return false;

            }

        }

        return true;

    }



    boolean hasTransientLaunch() {

        return mTransientLaunches != null && !mTransientLaunches.isEmpty();

    }
@@ -1224,6 +1246,16 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
                    mController.mAtm.mRootWindowContainer.getDisplayContent(mRecentsDisplayId);

            dc.getInputMonitor().setActiveRecents(null /* activity */, null /* layer */);

        }

        if (mTransientLaunches != null) {

            for (int i = mTransientLaunches.size() - 1; i >= 0; --i) {

                // Reset the ability of controlling SystemUi which might be changed by

                // setTransientLaunch or setRecentsAppBehindSystemBars.

                final Task task = mTransientLaunches.keyAt(i).getTask();

                if (task != null) {

                    task.setCanAffectSystemUiFlags(true);

                }

            }

        }



        for (int i = 0; i < mTargetDisplays.size(); ++i) {

            final DisplayContent dc = mTargetDisplays.get(i);

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

+13 −0
Original line number Diff line number Diff line
@@ -476,6 +476,19 @@ class TransitionController { 
        return false;

    }



    boolean canApplyDim(@Nullable Task task) {

        if (task == null) {

            // Always allow non-activity window.

            return true;

        }

        for (int i = mPlayingTransitions.size() - 1; i >= 0; --i) {

            if (!mPlayingTransitions.get(i).canApplyDim(task)) {

                return false;

            }

        }

        return true;

    }



    /**

     * During transient-launch, the "behind" app should retain focus during the transition unless

     * something takes focus from it explicitly (eg. by calling ATMS.setFocusedTask or by another

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

+2 −1
Original line number Diff line number Diff line
@@ -5121,12 +5121,13 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 


    private void applyDims() {

        if (((mAttrs.flags & FLAG_DIM_BEHIND) != 0 || shouldDrawBlurBehind())

                   && isVisibleNow() && !mHidden) {

                   && isVisibleNow() && !mHidden && mTransitionController.canApplyDim(getTask())) {

            // Only show the Dimmer when the following is satisfied:

            // 1. The window has the flag FLAG_DIM_BEHIND or blur behind is requested

            // 2. The WindowToken is not hidden so dims aren't shown when the window is exiting.

            // 3. The WS is considered visible according to the isVisible() method

            // 4. The WS is not hidden.

            // 5. The window is not in a transition or is in a transition that allows to dim.

            mIsDimming = true;

            final float dimAmount = (mAttrs.flags & FLAG_DIM_BEHIND) != 0 ? mAttrs.dimAmount : 0;

            final int blurRadius = shouldDrawBlurBehind() ? mAttrs.getBlurBehindRadius() : 0;