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

Commit 4d544e02 authored by Vania Desmonda's avatar Vania Desmonda
Browse files

Fix getting InputMethod from motionEvent on the click listener to get the actual input method. 

Bug: 375356876 
Change-Id: I35c4ce09a620b2b25ebb32abcb15aaf04ee5de2f
Test: atest DesktopModeEventLogger
Flag: com.android.window.flags.enable_resizing_metrics
parent b7347349

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

+6 −4
Original line number Diff line number Diff line
@@ -1575,8 +1575,6 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel, 


        final DesktopModeTouchEventListener touchEventListener =

                new DesktopModeTouchEventListener(taskInfo, taskPositioner);

        InputMethod inputMethod = DesktopModeEventLogger.getInputMethodFromMotionEvent(

                touchEventListener.mMotionEvent);

        windowDecoration.setOnMaximizeOrRestoreClickListener(() -> {

            onMaximizeOrRestore(taskInfo.taskId, "maximize_menu", ResizeTrigger.MAXIMIZE_MENU,

                    touchEventListener.mMotionEvent);
@@ -1587,11 +1585,15 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel, 
            return Unit.INSTANCE;

        });

        windowDecoration.setOnLeftSnapClickListener(() -> {

            onSnapResize(taskInfo.taskId, /* isLeft= */ true, inputMethod);

            onSnapResize(taskInfo.taskId, /* isLeft= */ true,

                    DesktopModeEventLogger.getInputMethodFromMotionEvent(

                            touchEventListener.mMotionEvent));

            return Unit.INSTANCE;

        });

        windowDecoration.setOnRightSnapClickListener(() -> {

            onSnapResize(taskInfo.taskId, /* isLeft= */ false, inputMethod);

            onSnapResize(taskInfo.taskId, /* isLeft= */ false,

                    DesktopModeEventLogger.getInputMethodFromMotionEvent(

                            touchEventListener.mMotionEvent));

            return Unit.INSTANCE;

        });

        windowDecoration.setOnToDesktopClickListener(desktopModeTransitionSource -> {