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 am: 5655546f83

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

Change-Id: I16dec1c1b0000304c1aff449a1c770a793d7be5b
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:57:10 +00:00
committed by Automerger Merge Worker
parent 433d8e2460 5655546f83
commit 50c6fb2dc9
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);
view.requestLayout();
view.getViewTreeObserver().addOnDrawListener(new ViewTreeObserver.OnDrawListener() {
view.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
private boolean mHandled = false;
@Override
public void onDraw() {
public boolean onPreDraw() {
if (mHandled) {
return;
return true;
}
mHandled = true;
// Transfer the splash screen view from shell to client.
// Call syncTransferSplashscreenViewTransaction at the first onDraw so we can ensure
// the client view is ready to show and we can use applyTransactionOnDraw to make
// all transitions happen at the same frame.
// Call syncTransferSplashscreenViewTransaction at the first onPreDraw, so we can
// ensure the client view is ready to show, and can use applyTransactionOnDraw to
// make all transitions happen at the same frame.
syncTransferSplashscreenViewTransaction(
view, r.token, decorView, startingWindowLeash);
view.post(() -> view.getViewTreeObserver().removeOnDrawListener(this));
view.post(() -> view.getViewTreeObserver().removeOnPreDrawListener(this));
return true;
}
});
}