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

Commit 244ee411 authored by Arpit Singh's avatar Arpit Singh
Browse files

[CD Cursor] Add topology-aware flag to relevant views 

This CL adds InputConfig::DISPLAY_TOPOLOGY_AWARE flag to the following
existing views that expect cross-display input gestures:
1. Window Drag
2. Content Drag and Drop

This CL does not introduce any functional change. In upcoming CLs
cross-display input gestures will be made opt-in and only sent to the
views using this InputConfig flag.

Bug: 401220484
Test: presubmit
Flag: com.android.input.flags.use_topology_aware_flag
Change-Id: I56501f425b0cad755bc42fe66c508e35a822bc2d
parent c28dfa68

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

+3 −0
Original line number Diff line number Diff line
@@ -1037,6 +1037,9 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
            }

            controlsElement.mAlignment = RelayoutParams.OccludingCaptionElement.Alignment.END;

            relayoutParams.mOccludingCaptionElements.add(controlsElement);



            relayoutParams.mInputFeatures |=

                        WindowManager.LayoutParams.INPUT_FEATURE_DISPLAY_TOPOLOGY_AWARE;

        } else if (isAppHandle && !DesktopModeFlags.ENABLE_HANDLE_INPUT_FIX.isTrue()) {

            // The focused decor (fullscreen/split) does not need to handle input because input in

            // the App Handle is handled by the InputMonitor in DesktopModeWindowDecorViewModel.

services/core/java/com/android/server/wm/DragState.java

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import android.graphics.Rect; 
import android.os.Binder;

import android.os.Build;

import android.os.IBinder;

import android.os.InputConfig;

import android.os.PersistableBundle;

import android.os.RemoteException;

import android.os.Trace;
@@ -436,6 +437,7 @@ class DragState { 
            mDragWindowHandle.ownerPid = MY_PID;

            mDragWindowHandle.ownerUid = MY_UID;

            mDragWindowHandle.scaleFactor = 1.0f;

            mDragWindowHandle.inputConfig = InputConfig.DISPLAY_TOPOLOGY_AWARE;



            // The drag window cannot receive new touches.

            mDragWindowHandle.touchableRegion.setEmpty();