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

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

Merge "Always invoke show on the dismiss target for pip." into tm-qpr-dev am: b8c71330 

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



Change-Id: I4cc6ba5cf821dced16726f424d1671f911d02cce
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 40274bf8 b8c71330

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

+3 −1
Original line number Diff line number Diff line
@@ -288,8 +288,10 @@ public class PipDismissTargetHandler implements ViewTreeObserver.OnPreDrawListen 


        if (mTargetViewContainer.getVisibility() != View.VISIBLE) {

            mTargetViewContainer.getViewTreeObserver().addOnPreDrawListener(this);

            mTargetViewContainer.show();

        }

        // always invoke show, since the target might still be VISIBLE while playing hide animation,

        // so we want to ensure it will show back again

        mTargetViewContainer.show();

    }



    /** Animates the magnetic dismiss target out and then sets it to GONE. */