Merge "Execute transition by starting window only if visible requested" into tm-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
6474fe47dd
@@ -6300,7 +6300,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
|
|||||||
// starting window is drawn, the transition can start earlier. Exclude finishing and bubble
|
// starting window is drawn, the transition can start earlier. Exclude finishing and bubble
|
||||||
// because it may be a trampoline.
|
// because it may be a trampoline.
|
||||||
if (!wasTaskVisible && mStartingData != null && !finishing && !mLaunchedFromBubble
|
if (!wasTaskVisible && mStartingData != null && !finishing && !mLaunchedFromBubble
|
||||||
&& !mDisplayContent.mAppTransition.isReady()
|
&& mVisibleRequested && !mDisplayContent.mAppTransition.isReady()
|
||||||
&& !mDisplayContent.mAppTransition.isRunning()
|
&& !mDisplayContent.mAppTransition.isRunning()
|
||||||
&& mDisplayContent.isNextTransitionForward()) {
|
&& mDisplayContent.isNextTransitionForward()) {
|
||||||
// The pending transition state will be cleared after the transition is started, so
|
// The pending transition state will be cleared after the transition is started, so
|
||||||
|
|||||||
Reference in New Issue
Block a user