From cfe6b04588a4036b1997881175f3c74d0a6790c8 Mon Sep 17 00:00:00 2001 From: Linus Tufvesson Date: Wed, 22 Dec 2021 14:51:18 +0000 Subject: [PATCH] Revert "Make Splash-screens touch opaque" This reverts commit c5b7502174159dc4519e2a0c3ba340522adf0575. Reason for revert: Breaks InputShellCommandTest Bug: 211748378 Change-Id: I89f551a4cb8e93338a5e3aa0ecdfe02d7bfff075 --- .../wm/shell/startingsurface/StartingSurfaceDrawer.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/StartingSurfaceDrawer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/StartingSurfaceDrawer.java index f69c27e749e4e..73f65b08a7eb6 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/StartingSurfaceDrawer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/StartingSurfaceDrawer.java @@ -269,12 +269,16 @@ public class StartingSurfaceDrawer { // touchable or focusable by the user. We also add in the ALT_FOCUSABLE_IM // flag because we do know that the next window will take input // focus, so we want to get the IME window up on top of us right away. - windowFlags |= WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE + windowFlags |= WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE + | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM; params.flags = windowFlags; params.token = appToken; params.packageName = activityInfo.packageName; params.privateFlags |= WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS; + // Setting as trusted overlay to let touches pass through. This is safe because this + // window is controlled by the system. + params.privateFlags |= WindowManager.LayoutParams.PRIVATE_FLAG_TRUSTED_OVERLAY; if (!context.getResources().getCompatibilityInfo().supportsScreen()) { params.privateFlags |= WindowManager.LayoutParams.PRIVATE_FLAG_COMPATIBLE_WINDOW;