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

Commit 34eaba84 authored by Merissa Mitchell's avatar Merissa Mitchell
Browse files

[WindowDecor] Fix incorrect WindowDecorContext in MaximizeMenu UI 

so that when the system language is changed, the context will have the
right locale so that the menu buttons' language is correctly set, even
when the task window is open.

Recall: http://recall/clips/447844af-c2b5-4557-85d1-6e95c24902ae

Bug: 414808810
Test: atest DesktopModeWindowDecorationTests
Flag: EXEMPT bugfix
Change-Id: I836f0785214579ef572e87416577051ea5326912
parent 0d8661b6

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)

                    },