Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix regression in recents animation consumer touchable region" into udc-dev

Browse Source
This commit is contained in:
Winson Chung
2023-06-21 05:57:41 +00:00
committed by Android (Google) Code Review
parent 004bbcdb14 306c6f3d05
commit 064a703275
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/wm/InputMonitor.java
View File

@@ -49,6 +49,7 @@ import static com.android.server.wm.WindowManagerService.LOGTAG_INPUT_FOCUS;
import static java.lang.Integer.MAX_VALUE; import static java.lang.Integer.MAX_VALUE;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.graphics.Rect;
import android.graphics.Region; import android.graphics.Region;
import android.os.Handler; import android.os.Handler;
import android.os.IBinder; import android.os.IBinder;
@@ -558,7 +559,8 @@ final class InputMonitor {
private boolean mAddWallpaperInputConsumerHandle; private boolean mAddWallpaperInputConsumerHandle;
private boolean mAddRecentsAnimationInputConsumerHandle; private boolean mAddRecentsAnimationInputConsumerHandle;
boolean mInDrag; private boolean mInDrag;
private final Rect mTmpRect = new Rect();
private void updateInputWindows(boolean inDrag) { private void updateInputWindows(boolean inDrag) {
Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "updateInputWindows"); Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "updateInputWindows");
@@ -582,8 +584,11 @@ final class InputMonitor {
layer = layer != null ? layer : activeRecents; layer = layer != null ? layer : activeRecents;
// Handle edge-case for SUW where windows don't exist yet // Handle edge-case for SUW where windows don't exist yet
if (layer.getSurfaceControl() != null) { if (layer.getSurfaceControl() != null) {
mRecentsAnimationInputConsumer.mWindowHandle final WindowState targetAppMainWindow = activeRecents.findMainWindow();
.replaceTouchableRegionWithCrop(layer.getSurfaceControl()); if (targetAppMainWindow != null) {
targetAppMainWindow.getBounds(mTmpRect);
mRecentsAnimationInputConsumer.mWindowHandle.touchableRegion.set(mTmpRect);
}
mRecentsAnimationInputConsumer.show(mInputTransaction, layer); mRecentsAnimationInputConsumer.show(mInputTransaction, layer);
mAddRecentsAnimationInputConsumerHandle = false; mAddRecentsAnimationInputConsumerHandle = false;
} }