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

Commit c8df321b authored by Garfield Tan's avatar Garfield Tan Committed by Android (Google) Code Review
Browse files

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

parents e221f896 545db773

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

     */