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

Commit c7d1fb3a authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove FLAG_SPLIT_TOUCH from WindowManager Shell" into main

parents 20cda896 cdb3faf8

libs/WindowManager/Shell/src/com/android/wm/shell/common/pip/PipMenuController.java

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


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

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

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

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

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

import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
@@ -111,7 +110,7 @@ public interface PipMenuController { 
            int width, int height) {

        final WindowManager.LayoutParams lp = new WindowManager.LayoutParams(width, height,

                TYPE_APPLICATION_OVERLAY,

                FLAG_WATCH_OUTSIDE_TOUCH | FLAG_SPLIT_TOUCH | FLAG_SLIPPERY | FLAG_NOT_TOUCHABLE,

                FLAG_WATCH_OUTSIDE_TOUCH | FLAG_SLIPPERY | FLAG_NOT_TOUCHABLE,

                PixelFormat.TRANSLUCENT);

        lp.privateFlags |= PRIVATE_FLAG_TRUSTED_OVERLAY;

        lp.setTitle(title);

libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitWindowManager.java

+1 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.wm.shell.common.split; 
import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;

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

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

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

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

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

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_TRUSTED_OVERLAY;
@@ -126,7 +125,7 @@ public final class SplitWindowManager extends WindowlessWindowManager { 
        WindowManager.LayoutParams lp = new WindowManager.LayoutParams(

                dividerBounds.width(), dividerBounds.height(), TYPE_DOCK_DIVIDER,

                FLAG_NOT_FOCUSABLE | FLAG_NOT_TOUCH_MODAL | FLAG_WATCH_OUTSIDE_TOUCH

                        | FLAG_SPLIT_TOUCH | FLAG_SLIPPERY,

                        | FLAG_SLIPPERY,

                PixelFormat.TRANSLUCENT);

        lp.token = new Binder();

        lp.setTitle(mWindowName);

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

+1 −2
Original line number Diff line number Diff line
@@ -74,8 +74,7 @@ class DesktopHeaderManageWindowsMenu( 
    override fun addToContainer(menuView: ManageWindowsView) {

        val menuPosition = Point(x, y)

        val flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or

                WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH or

                WindowManager.LayoutParams.FLAG_SPLIT_TOUCH

                WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH

        val desktopRepository = desktopUserRepositories.getProfile(callerTaskInfo.userId)

        menuViewContainer = if (Flags.enableFullyImmersiveInDesktop()

            && desktopRepository.isTaskInFullImmersiveState(callerTaskInfo.taskId)) {

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

+1 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
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;
@@ -122,7 +121,7 @@ class DragResizeInputListener implements AutoCloseable { 
                    mDecorationSurface,

                    mClientToken,

                    null /* hostInputToken */,

                    FLAG_NOT_FOCUSABLE | FLAG_SPLIT_TOUCH,

                    FLAG_NOT_FOCUSABLE,

                    PRIVATE_FLAG_TRUSTED_OVERLAY,

                    INPUT_FEATURE_SPY,

                    TYPE_APPLICATION,

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

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

                    height = menuHeight,

                    flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or

                            WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH or

                            WindowManager.LayoutParams.FLAG_SPLIT_TOUCH,

                            WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH,

                    view = handleMenuView.rootView,

                    forciblyShownTypes = if (forceShowSystemBars) { systemBars() } else { 0 },

                    ignoreCutouts = Flags.showAppHandleLargeScreens()