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

Commit 982f5300 authored by Arthur Hung's avatar Arthur Hung Committed by Automerger Merge Worker
Browse files

Merge "Fix pip window can't move in recents" into tm-dev am: 4a8619ce 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18157814



Change-Id: I2afb44da2caa5bfd845f206ce446d1273ef79cc7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 288efbce 4a8619ce

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

+8 −4
Original line number Original line Diff line number Diff line
@@ -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()) {