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

Commit 2525179c authored by Sergey Pinkevich's avatar Sergey Pinkevich Committed by Android (Google) Code Review
Browse files

Merge "Use Display Context for dragging to Desktop animator" into main

parents 72d0847c 840675f1

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

+5 −1
Original line number Diff line number Diff line
@@ -2152,8 +2152,12 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel, 
                    if (indicatorType != TO_FULLSCREEN_INDICATOR

                            || BubbleAnythingFlagHelper.enableBubbleToFullscreen()) {

                        if (mMoveToDesktopAnimator == null) {

                            Context displayContext = mDisplayController.getDisplayContext(

                                    ev.getDisplayId());

                            Context animatorContext =

                                    displayContext != null ? displayContext : mContext;

                            mMoveToDesktopAnimator = new MoveToDesktopAnimator(

                                    mContext, mDragToDesktopAnimationStartBounds,

                                    animatorContext, mDragToDesktopAnimationStartBounds,

                                    relevantDecor.getTaskInfo(), relevantDecor.getTaskSurface());

                            mDesktopTasksController.startDragToDesktop(relevantDecor.getTaskInfo(),

                                    mMoveToDesktopAnimator, relevantDecor.getTaskSurface(),