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

Merge "Ignore exit animation when view is detached from window." into sc-dev am: a1b3ce5250

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

Change-Id: I26beb7d7329d5eaf38a947c784be3ada33d09289
This commit is contained in:
Wei Sheng Shih
2021-06-22 11:15:40 +00:00
committed by Automerger Merge Worker
parent 37c3d45dec a1b3ce5250
commit 9517b68134
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashScreenExitAnimation.java
View File

@@ -235,7 +235,8 @@ public class SplashScreenExitAnimation implements Animator.AnimatorListener {
} }
void onAnimationProgress(float linearProgress) { void onAnimationProgress(float linearProgress) {
if (mFirstWindowSurface == null || !mFirstWindowSurface.isValid()) { if (mFirstWindowSurface == null || !mFirstWindowSurface.isValid()
|| !mSplashScreenView.isAttachedToWindow()) {
return; return;
} }
@@ -267,6 +268,7 @@ public class SplashScreenExitAnimation implements Animator.AnimatorListener {
return; return;
} }
final SurfaceControl.Transaction tx = mTransactionPool.acquire(); final SurfaceControl.Transaction tx = mTransactionPool.acquire();
if (mSplashScreenView.isAttachedToWindow()) {
tx.setFrameTimelineVsync(Choreographer.getSfInstance().getVsyncId()); tx.setFrameTimelineVsync(Choreographer.getSfInstance().getVsyncId());
SyncRtSurfaceTransactionApplier.SurfaceParams SyncRtSurfaceTransactionApplier.SurfaceParams
@@ -276,6 +278,10 @@ public class SplashScreenExitAnimation implements Animator.AnimatorListener {
.withMergeTransaction(tx) .withMergeTransaction(tx)
.build(); .build();
mApplier.scheduleApply(params); mApplier.scheduleApply(params);
} else {
tx.setWindowCrop(mFirstWindowSurface, null);
tx.apply();
}
mTransactionPool.release(tx); mTransactionPool.release(tx);
Choreographer.getSfInstance().postCallback(CALLBACK_COMMIT, Choreographer.getSfInstance().postCallback(CALLBACK_COMMIT,
@@ -287,13 +293,14 @@ public class SplashScreenExitAnimation implements Animator.AnimatorListener {
if (DEBUG_EXIT_ANIMATION) { if (DEBUG_EXIT_ANIMATION) {
Slog.v(TAG, "vanish animation finished"); Slog.v(TAG, "vanish animation finished");
} }
mSplashScreenView.post(() -> {
if (mSplashScreenView.isAttachedToWindow()) {
mSplashScreenView.setVisibility(GONE); mSplashScreenView.setVisibility(GONE);
if (mFinishCallback != null) { if (mFinishCallback != null) {
mFinishCallback.run(); mFinishCallback.run();
mFinishCallback = null; mFinishCallback = null;
} }
}); }
if (mShiftUpAnimation != null) { if (mShiftUpAnimation != null) {
mShiftUpAnimation.finish(); mShiftUpAnimation.finish();
} }