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

Commit 88c51799 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Revert "Add nav bar case to RemoteAnimationTarget of non-app window"" into sc-dev

parents d6973bfc 2a13ab66

core/java/android/view/RemoteAnimationTarget.java

+0 −23
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import static android.view.RemoteAnimationTargetProto.START_BOUNDS; 
import static android.view.RemoteAnimationTargetProto.START_LEASH;

import static android.view.RemoteAnimationTargetProto.TASK_ID;

import static android.view.RemoteAnimationTargetProto.WINDOW_CONFIGURATION;

import static android.view.WindowManager.LayoutParams.INVALID_WINDOW_TYPE;



import android.annotation.IntDef;

import android.app.PictureInPictureParams;
@@ -196,30 +195,12 @@ public class RemoteAnimationTarget implements Parcelable { 
     */

    public PictureInPictureParams pictureInPictureParams;



    /**

     * The {@link android.view.WindowManager.LayoutParams.WindowType} of this window. It's only used

     * for non-app window.

     */

    public final @WindowManager.LayoutParams.WindowType int windowType;



    public RemoteAnimationTarget(int taskId, int mode, SurfaceControl leash, boolean isTranslucent,

            Rect clipRect, Rect contentInsets, int prefixOrderIndex, Point position,

            Rect localBounds, Rect screenSpaceBounds,

            WindowConfiguration windowConfig, boolean isNotInRecents,

            SurfaceControl startLeash, Rect startBounds,

            PictureInPictureParams pictureInPictureParams) {

        this(taskId, mode, leash, isTranslucent, clipRect, contentInsets, prefixOrderIndex,

                position, localBounds, screenSpaceBounds, windowConfig, isNotInRecents, startLeash,

                startBounds, pictureInPictureParams, INVALID_WINDOW_TYPE);

    }



    public RemoteAnimationTarget(int taskId, int mode, SurfaceControl leash, boolean isTranslucent,

            Rect clipRect, Rect contentInsets, int prefixOrderIndex, Point position,

            Rect localBounds, Rect screenSpaceBounds,

            WindowConfiguration windowConfig, boolean isNotInRecents,

            SurfaceControl startLeash, Rect startBounds,

            PictureInPictureParams pictureInPictureParams,

            @WindowManager.LayoutParams.WindowType int windowType) {

        this.mode = mode;

        this.taskId = taskId;

        this.leash = leash;
@@ -236,7 +217,6 @@ public class RemoteAnimationTarget implements Parcelable { 
        this.startLeash = startLeash;

        this.startBounds = startBounds == null ? null : new Rect(startBounds);

        this.pictureInPictureParams = pictureInPictureParams;

        this.windowType = windowType;

    }



    public RemoteAnimationTarget(Parcel in) {
@@ -256,7 +236,6 @@ public class RemoteAnimationTarget implements Parcelable { 
        startLeash = in.readTypedObject(SurfaceControl.CREATOR);

        startBounds = in.readTypedObject(Rect.CREATOR);

        pictureInPictureParams = in.readTypedObject(PictureInPictureParams.CREATOR);

        windowType = in.readInt();

    }



    @Override
@@ -282,7 +261,6 @@ public class RemoteAnimationTarget implements Parcelable { 
        dest.writeTypedObject(startLeash, 0 /* flags */);

        dest.writeTypedObject(startBounds, 0 /* flags */);

        dest.writeTypedObject(pictureInPictureParams, 0 /* flags */);

        dest.writeInt(windowType);

    }



    public void dump(PrintWriter pw, String prefix) {
@@ -296,7 +274,6 @@ public class RemoteAnimationTarget implements Parcelable { 
        pw.print(" sourceContainerBounds="); sourceContainerBounds.printShortString(pw);

        pw.print(" screenSpaceBounds="); screenSpaceBounds.printShortString(pw);

        pw.print(" localBounds="); localBounds.printShortString(pw);

        pw.print(" windowType="); pw.print(windowType);

        pw.println();

        pw.print(prefix); pw.print("windowConfiguration="); pw.println(windowConfiguration);

        pw.print(prefix); pw.print("leash="); pw.println(leash);

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

+0 −7
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.systemui.shared.system;



import static android.view.WindowManager.LayoutParams.INVALID_WINDOW_TYPE;



import android.app.PictureInPictureParams;

import android.app.WindowConfiguration;

import android.graphics.Point;
@@ -46,9 +44,6 @@ public class RemoteAnimationTargetCompat { 
    public static final int ACTIVITY_TYPE_ASSISTANT = WindowConfiguration.ACTIVITY_TYPE_ASSISTANT;

    public final int activityType;



    public static final int TYPE_NAVIGATION_BAR = WindowManager.LayoutParams.TYPE_NAVIGATION_BAR;

    public final int windowType;



    public final int taskId;

    public final SurfaceControlCompat leash;

    public final boolean isTranslucent;
@@ -79,7 +74,6 @@ public class RemoteAnimationTargetCompat { 
        contentInsets = app.contentInsets;

        activityType = app.windowConfiguration.getActivityType();

        pictureInPictureParams = app.pictureInPictureParams;

        windowType = app.windowType;



        mStartLeash = app.startLeash;

    }
@@ -120,7 +114,6 @@ public class RemoteAnimationTargetCompat { 
            activityType = ACTIVITY_TYPE_UNDEFINED;

        }

        pictureInPictureParams = null;

        windowType = INVALID_WINDOW_TYPE;

        mStartLeash = null;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -1305,7 +1305,7 @@ public class AppTransition implements Dump { 
        if (isTransitionSet()) {

            clear();

            mNextAppTransitionType = NEXT_TRANSIT_TYPE_REMOTE;

            mRemoteAnimationController = new RemoteAnimationController(mService, mDisplayContent,

            mRemoteAnimationController = new RemoteAnimationController(mService,

                    remoteAnimationAdapter, mHandler);

        }

    }

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

+11 −54
Original line number Diff line number Diff line
@@ -16,12 +16,6 @@ 


package com.android.server.wm;



import static android.view.WindowManager.TRANSIT_OLD_KEYGUARD_GOING_AWAY;

import static android.view.WindowManager.TRANSIT_OLD_KEYGUARD_GOING_AWAY_ON_WALLPAPER;

import static android.view.WindowManager.TRANSIT_OLD_TASK_OPEN;

import static android.view.WindowManager.TRANSIT_OLD_TASK_TO_FRONT;

import static android.view.WindowManager.TRANSIT_OLD_WALLPAPER_CLOSE;



import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_REMOTE_ANIMATIONS;

import static com.android.server.wm.AnimationAdapterProto.REMOTE;

import static com.android.server.wm.RemoteAnimationAdapterWrapperProto.TARGET;
@@ -32,7 +26,6 @@ import android.os.SystemClock; 
import android.util.proto.ProtoOutputStream;

import android.view.RemoteAnimationTarget;

import android.view.SurfaceControl;

import android.view.WindowManager;



import com.android.internal.protolog.common.ProtoLog;

import com.android.server.policy.WindowManagerPolicy;
@@ -42,7 +35,7 @@ import java.util.ArrayList; 


class NonAppWindowAnimationAdapter implements AnimationAdapter {



    private final WindowContainer mWindow;

    private final WindowState mWindow;

    private RemoteAnimationTarget mTarget;

    private SurfaceControl mCapturedLeash;
@@ -54,43 +47,22 @@ class NonAppWindowAnimationAdapter implements AnimationAdapter { 
        return false;

    }



    NonAppWindowAnimationAdapter(WindowContainer w, long durationHint,

            long statusBarTransitionDelay) {

    NonAppWindowAnimationAdapter(WindowState w,

            long durationHint, long statusBarTransitionDelay) {

        mWindow = w;

        mDurationHint = durationHint;

        mStatusBarTransitionDelay = statusBarTransitionDelay;

    }



    static RemoteAnimationTarget[] startNonAppWindowAnimations(WindowManagerService service,

            DisplayContent displayContent, @WindowManager.TransitionOldType int transit,

            long durationHint, long statusBarTransitionDelay) {

        final ArrayList<RemoteAnimationTarget> targets = new ArrayList<>();

        if (transit == TRANSIT_OLD_KEYGUARD_GOING_AWAY

                || transit == TRANSIT_OLD_KEYGUARD_GOING_AWAY_ON_WALLPAPER) {

            startNonAppWindowAnimationsForKeyguardExit(

                    service, durationHint, statusBarTransitionDelay, targets);

        } else if (transit == TRANSIT_OLD_TASK_OPEN || transit == TRANSIT_OLD_TASK_TO_FRONT

                || transit == TRANSIT_OLD_WALLPAPER_CLOSE) {

            final boolean shouldAttachNavBarToApp =

                    displayContent.getDisplayPolicy().shouldAttachNavBarToAppDuringTransition()

                            && service.getRecentsAnimationController() == null

                            && displayContent.getFixedRotationAnimationController() == null;

            if (shouldAttachNavBarToApp) {

                startNavigationBarWindowAnimation(

                        displayContent, durationHint, statusBarTransitionDelay, targets);

            }

        }

        return targets.toArray(new RemoteAnimationTarget[targets.size()]);

    }



    /**

     * Creates and starts remote animations for all the visible non app windows.

     *

     * @return RemoteAnimationTarget[] targets for all the visible non app windows

     */

    private static void startNonAppWindowAnimationsForKeyguardExit(WindowManagerService service,

            long durationHint, long statusBarTransitionDelay,

            ArrayList<RemoteAnimationTarget> targets) {

    public static RemoteAnimationTarget[] startNonAppWindowAnimationsForKeyguardExit(

            WindowManagerService service, long durationHint, long statusBarTransitionDelay) {

        final ArrayList<RemoteAnimationTarget> targets = new ArrayList<>();



        final WindowManagerPolicy policy = service.mPolicy;

        service.mRoot.forAllWindows(nonAppWindow -> {

            if (nonAppWindow.mActivityRecord == null && policy.canBeHiddenByKeyguardLw(nonAppWindow)
@@ -102,22 +74,7 @@ class NonAppWindowAnimationAdapter implements AnimationAdapter { 
                targets.add(nonAppAdapter.createRemoteAnimationTarget());

            }

        }, true /* traverseTopToBottom */);

    }



    /**

     * Creates and starts remote animation for the navigation bar windows.

     *

     * @return RemoteAnimationTarget[] targets for all the visible non app windows

     */

    private static void startNavigationBarWindowAnimation(DisplayContent displayContent,

            long durationHint, long statusBarTransitionDelay,

            ArrayList<RemoteAnimationTarget> targets) {

        final WindowState navWindow = displayContent.getDisplayPolicy().getNavigationBar();

        final NonAppWindowAnimationAdapter nonAppAdapter = new NonAppWindowAnimationAdapter(

                navWindow.mToken, durationHint, statusBarTransitionDelay);

        navWindow.mToken.startAnimation(navWindow.mToken.getPendingTransaction(),

                nonAppAdapter, false /* hidden */, ANIMATION_TYPE_WINDOW_ANIMATION);

        targets.add(nonAppAdapter.createRemoteAnimationTarget());

        return targets.toArray(new RemoteAnimationTarget[targets.size()]);

    }



    /**
@@ -127,7 +84,7 @@ class NonAppWindowAnimationAdapter implements AnimationAdapter { 
        mTarget = new RemoteAnimationTarget(-1, -1, getLeash(), false,

                new Rect(), null, mWindow.getPrefixOrderIndex(), mWindow.getLastSurfacePosition(),

                mWindow.getBounds(), null, mWindow.getWindowConfiguration(), true, null, null,

                null, mWindow.getWindowType());

                null);

        return mTarget;

    }
@@ -163,8 +120,8 @@ class NonAppWindowAnimationAdapter implements AnimationAdapter { 
    @Override

    public void dump(PrintWriter pw, String prefix) {

        pw.print(prefix);

        pw.print("window=");

        pw.println(mWindow);

        pw.print("token=");

        pw.println(mWindow.mToken);

        if (mTarget != null) {

            pw.print(prefix);

            pw.println("Target:");

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

+9 −7
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


package com.android.server.wm;



import static android.view.WindowManager.TRANSIT_OLD_KEYGUARD_GOING_AWAY;

import static android.view.WindowManager.TRANSIT_OLD_KEYGUARD_GOING_AWAY_ON_WALLPAPER;



import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_REMOTE_ANIMATIONS;

import static com.android.server.wm.AnimationAdapterProto.REMOTE;

import static com.android.server.wm.RemoteAnimationAdapterWrapperProto.TARGET;
@@ -57,7 +60,6 @@ class RemoteAnimationController implements DeathRecipient { 
    private static final long TIMEOUT_MS = 2000;



    private final WindowManagerService mService;

    private final DisplayContent mDisplayContent;

    private final RemoteAnimationAdapter mRemoteAnimationAdapter;

    private final ArrayList<RemoteAnimationRecord> mPendingAnimations = new ArrayList<>();

    private final ArrayList<WallpaperAnimationAdapter> mPendingWallpaperAnimations =
@@ -70,10 +72,9 @@ class RemoteAnimationController implements DeathRecipient { 
    private boolean mCanceled;

    private boolean mLinkedToDeathOfRunner;



    RemoteAnimationController(WindowManagerService service, DisplayContent displayContent,

    RemoteAnimationController(WindowManagerService service,

            RemoteAnimationAdapter remoteAnimationAdapter, Handler handler) {

        mService = service;

        mDisplayContent = displayContent;

        mRemoteAnimationAdapter = remoteAnimationAdapter;

        mHandler = handler;

    }
@@ -220,11 +221,12 @@ class RemoteAnimationController implements DeathRecipient { 
    private RemoteAnimationTarget[] createNonAppWindowAnimations(

            @WindowManager.TransitionOldType int transit) {

        ProtoLog.d(WM_DEBUG_REMOTE_ANIMATIONS, "createNonAppWindowAnimations()");

        return NonAppWindowAnimationAdapter.startNonAppWindowAnimations(mService,

                    mDisplayContent,

                    transit,

        return (transit == TRANSIT_OLD_KEYGUARD_GOING_AWAY

                || transit == TRANSIT_OLD_KEYGUARD_GOING_AWAY_ON_WALLPAPER)

                ? NonAppWindowAnimationAdapter.startNonAppWindowAnimationsForKeyguardExit(mService,

                    mRemoteAnimationAdapter.getDuration(),

                    mRemoteAnimationAdapter.getStatusBarTransitionDelay());

                    mRemoteAnimationAdapter.getStatusBarTransitionDelay())

                : new RemoteAnimationTarget[0];

    }



    private void onAnimationFinished() {