Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Garfield Tan
2023-01-31 23:51:40 +00:00
committed by Android (Google) Code Review
parent e221f89672 545db773d1
commit c8df321b15
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,6 +36,7 @@ import com.android.wm.shell.ShellTaskOrganizer;
import com.android.wm.shell.common.DisplayController; import com.android.wm.shell.common.DisplayController;
import com.android.wm.shell.common.SyncTransactionQueue; import com.android.wm.shell.common.SyncTransactionQueue;
import com.android.wm.shell.freeform.FreeformTaskTransitionStarter; 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 * View model for the window decoration with a caption and shadows. Works with
@@ -65,6 +66,9 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel {
mTaskOrganizer = taskOrganizer; mTaskOrganizer = taskOrganizer;
mDisplayController = displayController; mDisplayController = displayController;
mSyncQueue = syncQueue; mSyncQueue = syncQueue;
if (!Transitions.ENABLE_SHELL_TRANSITIONS) {
mTaskOperations = new TaskOperations(null, mContext, mSyncQueue);
}
} }
@Override @Override

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

@@ -29,7 +29,8 @@ import com.android.wm.shell.freeform.FreeformTaskTransitionStarter;
*/ */
public interface WindowDecorViewModel { 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 * @param transitionStarter the transition starter that starts freeform task transitions
*/ */