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

Merge "Defer remove splash screen window until start transaction apply." into udc-dev

Browse Source
This commit is contained in:
Wei Sheng Shih
2023-04-18 02:37:10 +00:00
committed by Android (Google) Code Review
parent 97f689db8a d7fb5d979c
commit d9a252dcca
2 changed files with 48 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -2821,6 +2821,27 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
}
}
@Override
void waitForSyncTransactionCommit(ArraySet<WindowContainer> wcAwaitingCommit) {
super.waitForSyncTransactionCommit(wcAwaitingCommit);
if (mStartingData != null) {
mStartingData.mWaitForSyncTransactionCommit = true;
}
}
@Override
void onSyncTransactionCommitted(SurfaceControl.Transaction t) {
super.onSyncTransactionCommitted(t);
if (mStartingData == null) {
return;
}
mStartingData.mWaitForSyncTransactionCommit = false;
if (mStartingData.mRemoveAfterTransaction) {
mStartingData.mRemoveAfterTransaction = false;
removeStartingWindowAnimation(mStartingData.mPrepareRemoveAnimation);
}
}
void removeStartingWindowAnimation(boolean prepareAnimation) {
mTransferringSplashScreenState = TRANSFER_SPLASH_SCREEN_IDLE;
if (task != null) {
@@ -2843,6 +2864,12 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
final WindowState startingWindow = mStartingWindow;
final boolean animate;
if (mStartingData != null) {
if (mStartingData.mWaitForSyncTransactionCommit
|| mTransitionController.inCollectingTransition(startingWindow)) {
mStartingData.mRemoveAfterTransaction = true;
mStartingData.mPrepareRemoveAnimation = prepareAnimation;
return;
}
animate = prepareAnimation && mStartingData.needRevealAnimation()
&& mStartingWindow.isVisibleByPolicy();
ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Schedule remove starting %s startingWindow=%s"
@@ -2863,18 +2890,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
this);
return;
}
if (animate && mTransitionController.inCollectingTransition(startingWindow)) {
// Defer remove starting window after transition start.
// The surface of app window could really show after the transition finish.
startingWindow.mSyncTransaction.addTransactionCommittedListener(Runnable::run, () -> {
synchronized (mAtmService.mGlobalLock) {
surface.remove(true);
}
});
} else {
surface.remove(animate);
}
surface.remove(animate);
}
/**

20
services/core/java/com/android/server/wm/StartingData.java
View File

@@ -41,6 +41,26 @@ public abstract class StartingData {
/** Whether the starting window is drawn. */
boolean mIsDisplayed;
/**
* For Shell transition.
* There will be a transition happen on attached activity, do not remove starting window during
* this period, because the transaction to show app window may not apply before remove starting
* window.
* Note this isn't equal to transition playing, the period should be
* Sync finishNow -> Start transaction apply.
*/
boolean mWaitForSyncTransactionCommit;
/**
* For Shell transition.
* This starting window should be removed after applying the start transaction of transition,
* which ensures the app window has shown.
*/
boolean mRemoveAfterTransaction;
/** Whether to prepare the removal animation. */
boolean mPrepareRemoveAnimation;
protected StartingData(WindowManagerService service, int typeParams) {
mService = service;
mTypeParams = typeParams;