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

Commit 0df5d1e3 authored by Matt Sziklay's avatar Matt Sziklay Committed by Automerger Merge Worker
Browse files

Merge "Animation for Freeform -> Fullscreen Transition" into udc-dev am: db513368 

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



Change-Id: I085b715bebc61853441e54898bb3d5c9d85d1eda
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 716de1b3 db513368

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+14 −2
Original line number Original line Diff line number Diff line
@@ -54,6 +54,7 @@ import com.android.wm.shell.desktopmode.DesktopModeStatus; 
import com.android.wm.shell.desktopmode.DesktopModeTaskRepository;

import com.android.wm.shell.desktopmode.DesktopModeTaskRepository;

import com.android.wm.shell.desktopmode.DesktopTasksController;

import com.android.wm.shell.desktopmode.DesktopTasksController;

import com.android.wm.shell.desktopmode.EnterDesktopTaskTransitionHandler;

import com.android.wm.shell.desktopmode.EnterDesktopTaskTransitionHandler;

import com.android.wm.shell.desktopmode.ExitDesktopTaskTransitionHandler;

import com.android.wm.shell.draganddrop.DragAndDropController;

import com.android.wm.shell.draganddrop.DragAndDropController;

import com.android.wm.shell.freeform.FreeformComponents;

import com.android.wm.shell.freeform.FreeformComponents;

import com.android.wm.shell.freeform.FreeformTaskListener;

import com.android.wm.shell.freeform.FreeformTaskListener;
@@ -677,13 +678,15 @@ public abstract class WMShellModule { 
            SyncTransactionQueue syncQueue,

            SyncTransactionQueue syncQueue,

            RootTaskDisplayAreaOrganizer rootTaskDisplayAreaOrganizer,

            RootTaskDisplayAreaOrganizer rootTaskDisplayAreaOrganizer,

            Transitions transitions,

            Transitions transitions,

            EnterDesktopTaskTransitionHandler transitionHandler,

            EnterDesktopTaskTransitionHandler enterDesktopTransitionHandler,

            ExitDesktopTaskTransitionHandler exitDesktopTransitionHandler,

            @DynamicOverride DesktopModeTaskRepository desktopModeTaskRepository,

            @DynamicOverride DesktopModeTaskRepository desktopModeTaskRepository,

            @ShellMainThread ShellExecutor mainExecutor

            @ShellMainThread ShellExecutor mainExecutor

    ) {

    ) {

        return new DesktopTasksController(context, shellInit, shellController, displayController,

        return new DesktopTasksController(context, shellInit, shellController, displayController,

                shellTaskOrganizer, syncQueue, rootTaskDisplayAreaOrganizer, transitions,

                shellTaskOrganizer, syncQueue, rootTaskDisplayAreaOrganizer, transitions,

                transitionHandler, desktopModeTaskRepository, mainExecutor);

                enterDesktopTransitionHandler, exitDesktopTransitionHandler,

                desktopModeTaskRepository, mainExecutor);

    }

    }





    @WMSingleton

    @WMSingleton
@@ -693,6 +696,15 @@ public abstract class WMShellModule { 
        return new EnterDesktopTaskTransitionHandler(transitions);

        return new EnterDesktopTaskTransitionHandler(transitions);

    }

    }





    @WMSingleton

    @Provides

    static ExitDesktopTaskTransitionHandler provideExitDesktopTaskTransitionHandler(

            Transitions transitions,

            Context context

    ) {

        return new ExitDesktopTaskTransitionHandler(transitions, context);

    }



    @WMSingleton

    @WMSingleton

    @Provides

    @Provides

    @DynamicOverride

    @DynamicOverride

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt

+18 −4
Original line number Original line Diff line number Diff line
@@ -68,7 +68,8 @@ class DesktopTasksController( 
        private val syncQueue: SyncTransactionQueue,

        private val syncQueue: SyncTransactionQueue,

        private val rootTaskDisplayAreaOrganizer: RootTaskDisplayAreaOrganizer,

        private val rootTaskDisplayAreaOrganizer: RootTaskDisplayAreaOrganizer,

        private val transitions: Transitions,

        private val transitions: Transitions,

        private val animationTransitionHandler: EnterDesktopTaskTransitionHandler,

        private val enterDesktopTaskTransitionHandler: EnterDesktopTaskTransitionHandler,

        private val exitDesktopTaskTransitionHandler: ExitDesktopTaskTransitionHandler,

        private val desktopModeTaskRepository: DesktopModeTaskRepository,

        private val desktopModeTaskRepository: DesktopModeTaskRepository,

        @ShellMainThread private val mainExecutor: ShellExecutor

        @ShellMainThread private val mainExecutor: ShellExecutor

) : RemoteCallable<DesktopTasksController>, Transitions.TransitionHandler {

) : RemoteCallable<DesktopTasksController>, Transitions.TransitionHandler {
@@ -149,7 +150,7 @@ class DesktopTasksController( 
        wct.setBounds(taskInfo.token, startBounds)

        wct.setBounds(taskInfo.token, startBounds)





        if (Transitions.ENABLE_SHELL_TRANSITIONS) {

        if (Transitions.ENABLE_SHELL_TRANSITIONS) {

            animationTransitionHandler.startTransition(

            enterDesktopTaskTransitionHandler.startTransition(

                    Transitions.TRANSIT_ENTER_FREEFORM, wct)

                    Transitions.TRANSIT_ENTER_FREEFORM, wct)

        } else {

        } else {

            shellTaskOrganizer.applyTransaction(wct)

            shellTaskOrganizer.applyTransaction(wct)
@@ -167,7 +168,8 @@ class DesktopTasksController( 
        wct.setBounds(taskInfo.token, freeformBounds)

        wct.setBounds(taskInfo.token, freeformBounds)





        if (Transitions.ENABLE_SHELL_TRANSITIONS) {

        if (Transitions.ENABLE_SHELL_TRANSITIONS) {

            animationTransitionHandler.startTransition(Transitions.TRANSIT_ENTER_DESKTOP_MODE, wct)

            enterDesktopTaskTransitionHandler.startTransition(

                Transitions.TRANSIT_ENTER_DESKTOP_MODE, wct)

        } else {

        } else {

            shellTaskOrganizer.applyTransaction(wct)

            shellTaskOrganizer.applyTransaction(wct)

        }

        }
@@ -191,6 +193,18 @@ class DesktopTasksController( 
        }

        }

    }

    }





    fun moveToFullscreenWithAnimation(task: ActivityManager.RunningTaskInfo) {

        val wct = WindowContainerTransaction()

        addMoveToFullscreenChanges(wct, task.token)



        if (Transitions.ENABLE_SHELL_TRANSITIONS) {

            exitDesktopTaskTransitionHandler.startTransition(

            Transitions.TRANSIT_EXIT_DESKTOP_MODE, wct)

        } else {

            shellTaskOrganizer.applyTransaction(wct)

        }

    }



    /** Move a task to the front **/

    /** Move a task to the front **/

    fun moveTaskToFront(taskInfo: ActivityManager.RunningTaskInfo) {

    fun moveTaskToFront(taskInfo: ActivityManager.RunningTaskInfo) {

        val wct = WindowContainerTransaction()

        val wct = WindowContainerTransaction()
@@ -396,9 +410,9 @@ class DesktopTasksController( 
        val statusBarHeight = displayController

        val statusBarHeight = displayController

                .getDisplayLayout(taskInfo.displayId)?.stableInsets()?.top ?: 0

                .getDisplayLayout(taskInfo.displayId)?.stableInsets()?.top ?: 0

        if (y <= statusBarHeight && taskInfo.windowingMode == WINDOWING_MODE_FREEFORM) {

        if (y <= statusBarHeight && taskInfo.windowingMode == WINDOWING_MODE_FREEFORM) {

            moveToFullscreen(taskInfo.taskId)

            visualIndicator?.releaseFullscreenIndicator()

            visualIndicator?.releaseFullscreenIndicator()

            visualIndicator = null

            visualIndicator = null

            moveToFullscreenWithAnimation(taskInfo)

        }

        }

    }

    }

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/ExitDesktopTaskTransitionHandler.java

0 → 100644
+162 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.wm.shell.desktopmode;



import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;



import android.animation.ValueAnimator;

import android.app.ActivityManager;

import android.content.Context;

import android.content.res.Resources;

import android.graphics.Point;

import android.graphics.Rect;

import android.os.IBinder;

import android.util.DisplayMetrics;

import android.view.SurfaceControl;

import android.view.WindowManager;

import android.window.TransitionInfo;

import android.window.TransitionRequestInfo;

import android.window.WindowContainerTransaction;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



import com.android.internal.annotations.VisibleForTesting;

import com.android.wm.shell.transition.Transitions;



import java.util.ArrayList;

import java.util.List;

import java.util.function.Supplier;





/**

 * The {@link Transitions.TransitionHandler} that handles transitions for desktop mode tasks

 * entering and exiting freeform.

 */

public class ExitDesktopTaskTransitionHandler implements Transitions.TransitionHandler {

    private static final int FULLSCREEN_ANIMATION_DURATION = 336;

    private final Context mContext;

    private final Transitions mTransitions;

    private final List<IBinder> mPendingTransitionTokens = new ArrayList<>();



    private Supplier<SurfaceControl.Transaction> mTransactionSupplier;



    public ExitDesktopTaskTransitionHandler(

            Transitions transitions,

            Context context) {

        this(transitions, SurfaceControl.Transaction::new, context);

    }



    private ExitDesktopTaskTransitionHandler(

            Transitions transitions,

            Supplier<SurfaceControl.Transaction> supplier,

            Context context) {

        mTransitions = transitions;

        mTransactionSupplier = supplier;

        mContext = context;

    }



    /**

     * Starts Transition of a given type

     * @param type Transition type

     * @param wct WindowContainerTransaction for transition

     */

    public void startTransition(@WindowManager.TransitionType int type,

            @NonNull WindowContainerTransaction wct) {

        final IBinder token = mTransitions.startTransition(type, wct, this);

        mPendingTransitionTokens.add(token);

    }



    @Override

    public boolean startAnimation(@NonNull IBinder transition, @NonNull TransitionInfo info,

            @NonNull SurfaceControl.Transaction startT,

            @NonNull SurfaceControl.Transaction finishT,

            @NonNull Transitions.TransitionFinishCallback finishCallback) {

        boolean transitionHandled = false;

        for (TransitionInfo.Change change : info.getChanges()) {

            if ((change.getFlags() & TransitionInfo.FLAG_IS_WALLPAPER) != 0) {

                continue;

            }



            final ActivityManager.RunningTaskInfo taskInfo = change.getTaskInfo();

            if (taskInfo == null || taskInfo.taskId == -1) {

                continue;

            }



            if (change.getMode() == WindowManager.TRANSIT_CHANGE) {

                transitionHandled |= startChangeTransition(

                        transition, info.getType(), change, startT, finishCallback);

            }

        }



        mPendingTransitionTokens.remove(transition);



        return transitionHandled;

    }



    @VisibleForTesting

    boolean startChangeTransition(

            @NonNull IBinder transition,

            @WindowManager.TransitionType int type,

            @NonNull TransitionInfo.Change change,

            @NonNull SurfaceControl.Transaction startT,

            @NonNull Transitions.TransitionFinishCallback finishCallback) {

        if (!mPendingTransitionTokens.contains(transition)) {

            return false;

        }

        final ActivityManager.RunningTaskInfo taskInfo = change.getTaskInfo();

        if (type == Transitions.TRANSIT_EXIT_DESKTOP_MODE

                && taskInfo.getWindowingMode() == WINDOWING_MODE_FULLSCREEN) {

            // This Transition animates a task to fullscreen after being dragged to status bar

            final Resources resources = mContext.getResources();

            final DisplayMetrics metrics = resources.getDisplayMetrics();

            final int screenWidth = metrics.widthPixels;

            final int screenHeight = metrics.heightPixels;

            final SurfaceControl sc = change.getLeash();

            startT.setCrop(sc, null);

            startT.apply();

            final ValueAnimator animator = new ValueAnimator();

            animator.setFloatValues(0f, 1f);

            animator.setDuration(FULLSCREEN_ANIMATION_DURATION);

            final Rect startBounds = change.getStartAbsBounds();

            final float scaleX = (float) startBounds.width() / screenWidth;

            final float scaleY = (float) startBounds.height() / screenHeight;

            final SurfaceControl.Transaction t = mTransactionSupplier.get();

            Point startPos = new Point(startBounds.left,

                    startBounds.top);

            animator.addUpdateListener(animation -> {

                float fraction = animation.getAnimatedFraction();

                float currentScaleX = scaleX + ((1 - scaleX) * fraction);

                float currentScaleY = scaleY + ((1 - scaleY) * fraction);

                t.setPosition(sc, startPos.x * (1 - fraction), startPos.y * (1 - fraction));

                t.setScale(sc, currentScaleX, currentScaleY);

                t.apply();

            });

            animator.start();

            return true;

        }



        return false;

    }



    @Nullable

    @Override

    public WindowContainerTransaction handleRequest(@NonNull IBinder transition,

            @NonNull TransitionRequestInfo request) {

        return null;

    }

}

libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -140,6 +140,9 @@ public class Transitions implements RemoteCallable<Transitions> { 
    /** Transition type to freeform in desktop mode. */

    /** Transition type to freeform in desktop mode. */

    public static final int TRANSIT_ENTER_DESKTOP_MODE = WindowManager.TRANSIT_FIRST_CUSTOM + 11;

    public static final int TRANSIT_ENTER_DESKTOP_MODE = WindowManager.TRANSIT_FIRST_CUSTOM + 11;





    /** Transition type to fullscreen from desktop mode. */

    public static final int TRANSIT_EXIT_DESKTOP_MODE = WindowManager.TRANSIT_FIRST_CUSTOM + 12;



    private final WindowOrganizer mOrganizer;

    private final WindowOrganizer mOrganizer;

    private final Context mContext;

    private final Context mContext;

    private final ShellExecutor mMainExecutor;

    private final ShellExecutor mMainExecutor;

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt

+4 −2
Original line number Original line Diff line number Diff line
@@ -81,7 +81,8 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    @Mock lateinit var syncQueue: SyncTransactionQueue

    @Mock lateinit var syncQueue: SyncTransactionQueue

    @Mock lateinit var rootTaskDisplayAreaOrganizer: RootTaskDisplayAreaOrganizer

    @Mock lateinit var rootTaskDisplayAreaOrganizer: RootTaskDisplayAreaOrganizer

    @Mock lateinit var transitions: Transitions

    @Mock lateinit var transitions: Transitions

    @Mock lateinit var transitionHandler: EnterDesktopTaskTransitionHandler

    @Mock lateinit var exitDesktopTransitionHandler: ExitDesktopTaskTransitionHandler

    @Mock lateinit var enterDesktopTransitionHandler: EnterDesktopTaskTransitionHandler





    lateinit var mockitoSession: StaticMockitoSession

    lateinit var mockitoSession: StaticMockitoSession

    lateinit var controller: DesktopTasksController

    lateinit var controller: DesktopTasksController
@@ -117,7 +118,8 @@ class DesktopTasksControllerTest : ShellTestCase() { 
            syncQueue,

            syncQueue,

            rootTaskDisplayAreaOrganizer,

            rootTaskDisplayAreaOrganizer,

            transitions,

            transitions,

            transitionHandler,

            enterDesktopTransitionHandler,

            exitDesktopTransitionHandler,

            desktopModeTaskRepository,

            desktopModeTaskRepository,

            TestShellExecutor()

            TestShellExecutor()

        )

        )