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

Merge "Fix pip window can't move in recents" into tm-dev

Browse Source
This commit is contained in:
Arthur Hung
2022-05-06 14:06:41 +00:00
committed by Android (Google) Code Review
parent 7ecba896fa 62ff35d2ab
commit 4a8619cedb
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -573,7 +573,7 @@ final class InputMonitor {
recentsAnimationController.getTargetAppDisplayArea(); recentsAnimationController.getTargetAppDisplayArea();
if (targetDA != null) { if (targetDA != null) {
mRecentsAnimationInputConsumer.reparent(mInputTransaction, targetDA); mRecentsAnimationInputConsumer.reparent(mInputTransaction, targetDA);
mRecentsAnimationInputConsumer.show(mInputTransaction, MAX_VALUE - 1); mRecentsAnimationInputConsumer.show(mInputTransaction, MAX_VALUE - 2);
mAddRecentsAnimationInputConsumerHandle = false; mAddRecentsAnimationInputConsumerHandle = false;
} }
} }
@@ -584,12 +584,16 @@ final class InputMonitor {
final Task rootTask = w.getTask().getRootTask(); final Task rootTask = w.getTask().getRootTask();
mPipInputConsumer.mWindowHandle.replaceTouchableRegionWithCrop( mPipInputConsumer.mWindowHandle.replaceTouchableRegionWithCrop(
rootTask.getSurfaceControl()); rootTask.getSurfaceControl());
final DisplayArea targetDA = rootTask.getDisplayArea();
// We set the layer to z=MAX-1 so that it's always on top. // We set the layer to z=MAX-1 so that it's always on top.
mPipInputConsumer.reparent(mInputTransaction, rootTask); if (targetDA != null) {
mPipInputConsumer.layout(mInputTransaction, rootTask.getBounds());
mPipInputConsumer.reparent(mInputTransaction, targetDA);
mPipInputConsumer.show(mInputTransaction, MAX_VALUE - 1); mPipInputConsumer.show(mInputTransaction, MAX_VALUE - 1);
mAddPipInputConsumerHandle = false; mAddPipInputConsumerHandle = false;
} }
} }
}
if (mAddWallpaperInputConsumerHandle) { if (mAddWallpaperInputConsumerHandle) {
if (w.mAttrs.type == TYPE_WALLPAPER && w.isVisible()) { if (w.mAttrs.type == TYPE_WALLPAPER && w.isVisible()) {