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

Commit 520f25e9 authored by Merissa Mitchell's avatar Merissa Mitchell Committed by Android (Google) Code Review
Browse files

Merge "[WindowDecor] Fix incorrect WindowDecorContext in MaximizeMenu UI" into main

parents f33540d9 34eaba84

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

+1 −1
Original line number Diff line number Diff line
@@ -1440,7 +1440,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
        mDesktopModeUiEventLogger.log(mTaskInfo,

                DesktopUiEventEnum.DESKTOP_WINDOW_MAXIMIZE_BUTTON_REVEAL_MENU);

        mMaximizeMenu = mMaximizeMenuFactory.create(mSyncQueue, mRootTaskDisplayAreaOrganizer,

                mDisplayController, mWindowDecorationActions, mTaskInfo, mContext,

                mDisplayController, mWindowDecorationActions, mTaskInfo, mDecorWindowContext,

                (width, height) -> calculateMaximizeMenuPosition(width, height),

                mSurfaceControlTransactionSupplier, mDesktopModeUiEventLogger);

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/caption/AppHeaderController.kt

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ class AppHeaderController( 
                    displayController = displayController,

                    windowDecorationActions = windowDecorationActions,

                    taskInfo = taskInfo,

                    decorWindowContext = context,

                    decorWindowContext = decorWindowContext,

                    positionSupplier = { width, height ->

                        calculateMaximizeMenuPosition(width, height)

                    },