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

Commit 6a6bcc48 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 am: db75775b 

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



Change-Id: I715b2f46282c5ae2ebdcd27847b291842d1293ec
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 09496ee4 db75775b

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

+8 −4
Original line number Diff line number Diff line
@@ -568,7 +568,7 @@ final class InputMonitor { 
                            recentsAnimationController.getTargetAppDisplayArea();

                    if (targetDA != null) {

                        mRecentsAnimationInputConsumer.reparent(mInputTransaction, targetDA);

                        mRecentsAnimationInputConsumer.show(mInputTransaction, MAX_VALUE - 1);

                        mRecentsAnimationInputConsumer.show(mInputTransaction, MAX_VALUE - 2);

                        mAddRecentsAnimationInputConsumerHandle = false;

                    }

                }
@@ -579,12 +579,16 @@ final class InputMonitor { 
                    final Task rootTask = w.getTask().getRootTask();

                    mPipInputConsumer.mWindowHandle.replaceTouchableRegionWithCrop(

                            rootTask.getSurfaceControl());

                    final DisplayArea targetDA = rootTask.getDisplayArea();

                    // 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);

                        mAddPipInputConsumerHandle = false;

                    }

                }

            }



            if (mAddWallpaperInputConsumerHandle) {

                if (w.mAttrs.type == TYPE_WALLPAPER && w.isVisible()) {