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

Merge "Fix screenshot surface null during animation" into tm-qpr-dev

Browse Source
This commit is contained in:
Tony Huang
2023-01-16 06:37:26 +00:00
committed by Android (Google) Code Review
parent 2a27ca4e5f 630d25c619
commit 00d5f82854
1 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitDecorManager.java
View File

@@ -78,6 +78,7 @@ public class SplitDecorManager extends WindowlessWindowManager {
private final Rect mResizingBounds = new Rect(); private final Rect mResizingBounds = new Rect();
private final Rect mTempRect = new Rect(); private final Rect mTempRect = new Rect();
private ValueAnimator mFadeAnimator; private ValueAnimator mFadeAnimator;
private ValueAnimator mScreenshotAnimator;
private int mIconSize; private int mIconSize;
private int mOffsetX; private int mOffsetX;
@@ -135,8 +136,17 @@ public class SplitDecorManager extends WindowlessWindowManager {
/** Releases the surfaces for split decor. */ /** Releases the surfaces for split decor. */
public void release(SurfaceControl.Transaction t) { public void release(SurfaceControl.Transaction t) {
if (mFadeAnimator != null && mFadeAnimator.isRunning()) { if (mFadeAnimator != null) {
mFadeAnimator.cancel(); if (mFadeAnimator.isRunning()) {
mFadeAnimator.cancel();
}
mFadeAnimator = null;
}
if (mScreenshotAnimator != null) {
if (mScreenshotAnimator.isRunning()) {
mScreenshotAnimator.cancel();
}
mScreenshotAnimator = null;
} }
if (mViewHost != null) { if (mViewHost != null) {
mViewHost.release(); mViewHost.release();
@@ -238,16 +248,20 @@ public class SplitDecorManager extends WindowlessWindowManager {
/** Stops showing resizing hint. */ /** Stops showing resizing hint. */
public void onResized(SurfaceControl.Transaction t, Runnable animFinishedCallback) { public void onResized(SurfaceControl.Transaction t, Runnable animFinishedCallback) {
if (mScreenshot != null) { if (mScreenshot != null) {
if (mScreenshotAnimator != null && mScreenshotAnimator.isRunning()) {
mScreenshotAnimator.cancel();
}
t.setPosition(mScreenshot, mOffsetX, mOffsetY); t.setPosition(mScreenshot, mOffsetX, mOffsetY);
final SurfaceControl.Transaction animT = new SurfaceControl.Transaction(); final SurfaceControl.Transaction animT = new SurfaceControl.Transaction();
final ValueAnimator va = ValueAnimator.ofFloat(1, 0); mScreenshotAnimator = ValueAnimator.ofFloat(1, 0);
va.addUpdateListener(valueAnimator -> { mScreenshotAnimator.addUpdateListener(valueAnimator -> {
final float progress = (float) valueAnimator.getAnimatedValue(); final float progress = (float) valueAnimator.getAnimatedValue();
animT.setAlpha(mScreenshot, progress); animT.setAlpha(mScreenshot, progress);
animT.apply(); animT.apply();
}); });
va.addListener(new AnimatorListenerAdapter() { mScreenshotAnimator.addListener(new AnimatorListenerAdapter() {
@Override @Override
public void onAnimationStart(Animator animation) { public void onAnimationStart(Animator animation) {
mRunningAnimationCount++; mRunningAnimationCount++;
@@ -266,7 +280,7 @@ public class SplitDecorManager extends WindowlessWindowManager {
} }
} }
}); });
va.start(); mScreenshotAnimator.start();
} }
if (mResizingIconView == null) { if (mResizingIconView == null) {
@@ -292,9 +306,6 @@ public class SplitDecorManager extends WindowlessWindowManager {
}); });
return; return;
} }
// If fade-in animation is running, cancel it and re-run fade-out one.
mFadeAnimator.cancel();
} }
if (mShown) { if (mShown) {
fadeOutDecor(animFinishedCallback); fadeOutDecor(animFinishedCallback);
@@ -332,6 +343,11 @@ public class SplitDecorManager extends WindowlessWindowManager {
* directly. */ * directly. */
public void fadeOutDecor(Runnable finishedCallback) { public void fadeOutDecor(Runnable finishedCallback) {
if (mShown) { if (mShown) {
// If previous animation is running, just cancel it.
if (mFadeAnimator != null && mFadeAnimator.isRunning()) {
mFadeAnimator.cancel();
}
startFadeAnimation(false /* show */, true, finishedCallback); startFadeAnimation(false /* show */, true, finishedCallback);
mShown = false; mShown = false;
} else { } else {