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

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

Browse Source
This commit is contained in:
Mateusz Cicheński
2023-02-22 21:11:03 +00:00
committed by Android (Google) Code Review
parent 038359aa1b 329b65045f
commit 489880bcfb
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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. */ /** Adds the magnetic target view to the WindowManager so it's ready to be animated in. */
public void createOrUpdateDismissTarget() { public void createOrUpdateDismissTarget() {
if (!mTargetViewContainer.isAttachedToWindow()) { if (mTargetViewContainer.getParent() == null) {
mTargetViewContainer.cancelAnimators(); mTargetViewContainer.cancelAnimators();
mTargetViewContainer.setVisibility(View.INVISIBLE); mTargetViewContainer.setVisibility(View.INVISIBLE);
mTargetViewContainer.getViewTreeObserver().removeOnPreDrawListener(this); mTargetViewContainer.getViewTreeObserver().removeOnPreDrawListener(this);
mHasDismissTargetSurface = false; mHasDismissTargetSurface = false;
try {
mWindowManager.addView(mTargetViewContainer, getDismissTargetLayoutParams()); 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 { } else {
mWindowManager.updateViewLayout(mTargetViewContainer, getDismissTargetLayoutParams()); 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. * Removes the dismiss target and cancels any pending callbacks to show it.
*/ */
public void cleanUpDismissTarget() { public void cleanUpDismissTarget() {
if (mTargetViewContainer.isAttachedToWindow()) { if (mTargetViewContainer.getParent() != null) {
mWindowManager.removeViewImmediate(mTargetViewContainer); mWindowManager.removeViewImmediate(mTargetViewContainer);
} }
} }