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

Commit 037811be authored by Garfield Tan's avatar Garfield Tan Committed by Automerger Merge Worker
Browse files

Merge "Create TaskOperations when shell transition is off" into tm-qpr-dev am:... 

Merge "Create TaskOperations when shell transition is off" into tm-qpr-dev am: c8df321b am: 89aa133f

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



Change-Id: I9b56ea5a599f458c4e1eecf3c51cbaeb01f43b3a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 381312d1 89aa133f

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecorViewModel.java

+4 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import com.android.wm.shell.ShellTaskOrganizer; 
import com.android.wm.shell.common.DisplayController;

import com.android.wm.shell.common.SyncTransactionQueue;

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

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



/**

 * View model for the window decoration with a caption and shadows. Works with
@@ -65,6 +66,9 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel { 
        mTaskOrganizer = taskOrganizer;

        mDisplayController = displayController;

        mSyncQueue = syncQueue;

        if (!Transitions.ENABLE_SHELL_TRANSITIONS) {

            mTaskOperations = new TaskOperations(null, mContext, mSyncQueue);

        }

    }



    @Override

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecorViewModel.java

+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ import com.android.wm.shell.freeform.FreeformTaskTransitionStarter; 
 */

public interface WindowDecorViewModel {

    /**

     * Sets the transition starter that starts freeform task transitions.

     * Sets the transition starter that starts freeform task transitions. Only called when

     * {@link com.android.wm.shell.transition.Transitions#ENABLE_SHELL_TRANSITIONS} is {@code true}.

     *

     * @param transitionStarter the transition starter that starts freeform task transitions

     */