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

Commit c200b846 authored by Mateusz Cicheński's avatar Mateusz Cicheński Committed by Automerger Merge Worker
Browse files

Merge "Remove dismiss target only when it's attached to a parent." into tm-qpr-dev am: 489880bc 

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



Change-Id: I371feb8ebab492e909fa7dc8e7604244e8d62064
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fd3769ca 489880bc

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipDismissTargetHandler.java

+3 −10
Original line number Diff line number Diff line
@@ -235,21 +235,14 @@ public class PipDismissTargetHandler implements ViewTreeObserver.OnPreDrawListen 


    /** Adds the magnetic target view to the WindowManager so it's ready to be animated in. */

    public void createOrUpdateDismissTarget() {

        if (!mTargetViewContainer.isAttachedToWindow()) {

        if (mTargetViewContainer.getParent() == null) {

            mTargetViewContainer.cancelAnimators();



            mTargetViewContainer.setVisibility(View.INVISIBLE);

            mTargetViewContainer.getViewTreeObserver().removeOnPreDrawListener(this);

            mHasDismissTargetSurface = false;



            try {

            mWindowManager.addView(mTargetViewContainer, getDismissTargetLayoutParams());

            } catch (IllegalStateException e) {

                // This shouldn't happen, but if the target is already added, just update its layout

                // params.

                mWindowManager.updateViewLayout(

                        mTargetViewContainer, getDismissTargetLayoutParams());

            }

        } else {

            mWindowManager.updateViewLayout(mTargetViewContainer, getDismissTargetLayoutParams());

        }
@@ -306,7 +299,7 @@ public class PipDismissTargetHandler implements ViewTreeObserver.OnPreDrawListen 
     * Removes the dismiss target and cancels any pending callbacks to show it.

     */

    public void cleanUpDismissTarget() {

        if (mTargetViewContainer.isAttachedToWindow()) {

        if (mTargetViewContainer.getParent() != null) {

            mWindowManager.removeViewImmediate(mTargetViewContainer);

        }

    }