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

Commit ce00b220 authored by Jorge Gil's avatar Jorge Gil
Browse files

Add FLAG_SPLIT_TOUCH to window decoration windows 

Adds it to the App Header, App Handle, both menus and the
DragResizeInputListener as a workaround for a crash when splitting
motion event is enabled.

Also removes the input channel from the ResizeVeil as it is not needed,
and since drag-moving two tasks simoultaneously with two pointers is now
possible, this change prevents |moveTaskToFront| from being called on
every |onTouch| call for each of the tasks, which would cause flickering
as both tasks tried to move to front repeatedly during the dual
drag-move gestures.

Bug: 352306102
Test: check input continues to work on all of these windows, and
drag-moving two windows at the same works fine without flickering.
Flag: EXEMPT bugfix

Change-Id: I54630b1d26444f31a52a47c2756ebb90d5d66bbf
parent 9242e041

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

+9 −1
Original line number Diff line number Diff line
@@ -619,13 +619,21 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
                    && id != R.id.maximize_window) {

                return false;

            }

            moveTaskToFront(decoration.mTaskInfo);



            final int actionMasked = e.getActionMasked();

            final boolean isDown = actionMasked == MotionEvent.ACTION_DOWN;

            final boolean isUpOrCancel = actionMasked == MotionEvent.ACTION_CANCEL

                    || actionMasked == MotionEvent.ACTION_UP;

            if (isDown) {

                // Only move to front on down to prevent 2+ tasks from fighting

                // (and thus flickering) for front status when drag-moving them simultaneously with

                // two pointers.

                // TODO(b/356962065): during a drag-move, this shouldn't be a WCT - just move the

                //  task surface to the top of other tasks and reorder once the user releases the

                //  gesture together with the bounds' WCT. This is probably still valid for other

                //  gestures like simple clicks.

                moveTaskToFront(decoration.mTaskInfo);



                final boolean downInCustomizableCaptionRegion =

                        decoration.checkTouchEventInCustomizableRegion(e);

                final boolean downInExclusionRegion = mExclusionRegion.contains(

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

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.wm.shell.windowdecor;



import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;

import static android.view.WindowManager.LayoutParams.FLAG_SPLIT_TOUCH;

import static android.view.WindowManager.LayoutParams.INPUT_FEATURE_NO_INPUT_CHANNEL;

import static android.view.WindowManager.LayoutParams.INPUT_FEATURE_SPY;

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_TRUSTED_OVERLAY;
@@ -112,7 +113,7 @@ class DragResizeInputListener implements AutoCloseable { 
                    mDecorationSurface,

                    mClientToken,

                    null /* hostInputToken */,

                    FLAG_NOT_FOCUSABLE,

                    FLAG_NOT_FOCUSABLE | FLAG_SPLIT_TOUCH,

                    PRIVATE_FLAG_TRUSTED_OVERLAY,

                    INPUT_FEATURE_SPY,

                    TYPE_APPLICATION,

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

+2 −1
Original line number Diff line number Diff line
@@ -185,7 +185,8 @@ class HandleMenu( 
                    width = menuWidth,

                    height = menuHeight,

                    flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or

                            WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH,

                            WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH or

                            WindowManager.LayoutParams.FLAG_SPLIT_TOUCH,

                    view = handleMenuView.rootView

                )

            } else {

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

+2 −1
Original line number Diff line number Diff line
@@ -146,7 +146,8 @@ class MaximizeMenu( 
                menuHeight,

                WindowManager.LayoutParams.TYPE_APPLICATION,

                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE

                        or WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH,

                        or WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH

                        or WindowManager.LayoutParams.FLAG_SPLIT_TOUCH,

                PixelFormat.TRANSPARENT

        )

        lp.title = "Maximize Menu for Task=" + taskInfo.taskId

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

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.view.SurfaceControl 
import android.view.SurfaceControlViewHost

import android.view.SurfaceSession

import android.view.WindowManager

import android.view.WindowManager.LayoutParams.INPUT_FEATURE_NO_INPUT_CHANNEL

import android.view.WindowlessWindowManager

import android.widget.ImageView

import android.window.TaskConstants
@@ -151,6 +152,7 @@ class ResizeVeil @JvmOverloads constructor( 
                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,

                PixelFormat.TRANSPARENT)

        lp.title = "Resize veil icon window of Task=" + taskInfo.taskId

        lp.inputFeatures = INPUT_FEATURE_NO_INPUT_CHANNEL

        lp.setTrustedOverlay()

        val wwm = WindowlessWindowManager(taskInfo.configuration,

                iconSurface, null /* hostInputToken */)