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

Merge "Fix no AVD transfer to client when using setOnExitAnimationListener" into udc-dev am: 17cea5da0f am: e9fc26f85c

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

Change-Id: I05e90d44a3430685fc27e1af1f90fc9f166af97e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Wei Sheng Shih
2023-07-10 08:11:28 +00:00
committed by Automerger Merge Worker
parent ebde6c42bc e9fc26f85c
commit 5655546f83
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/app/ActivityThread.java
View File

@@ -4226,21 +4226,22 @@ public final class ActivityThread extends ClientTransactionHandler
decorView.addView(view); decorView.addView(view);
view.requestLayout(); view.requestLayout();
view.getViewTreeObserver().addOnDrawListener(new ViewTreeObserver.OnDrawListener() { view.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
private boolean mHandled = false; private boolean mHandled = false;
@Override @Override
public void onDraw() { public boolean onPreDraw() {
if (mHandled) { if (mHandled) {
return; return true;
} }
mHandled = true; mHandled = true;
// Transfer the splash screen view from shell to client. // Transfer the splash screen view from shell to client.
// Call syncTransferSplashscreenViewTransaction at the first onDraw so we can ensure // Call syncTransferSplashscreenViewTransaction at the first onPreDraw, so we can
// the client view is ready to show and we can use applyTransactionOnDraw to make // ensure the client view is ready to show, and can use applyTransactionOnDraw to
// all transitions happen at the same frame. // make all transitions happen at the same frame.
syncTransferSplashscreenViewTransaction( syncTransferSplashscreenViewTransaction(
view, r.token, decorView, startingWindowLeash); view, r.token, decorView, startingWindowLeash);
view.post(() -> view.getViewTreeObserver().removeOnDrawListener(this)); view.post(() -> view.getViewTreeObserver().removeOnPreDrawListener(this));
return true;
} }
}); });
} }