Skip to content
Snippets Groups Projects
Commit 27c58b4b authored by Matt Casey's avatar Matt Casey Committed by Android (Google) Code Review
Browse files

Merge "Disable screenshot shared transitions if view is not attached" into 24D1-dev

parents b88d7399 3adecc69
No related branches found
No related tags found
No related merge requests found
......@@ -91,12 +91,19 @@ constructor(
} else {
dismissKeyguard()
}
transitionCoordinator?.startExit()
var transitionOptions: ActivityOptions? = null
if (transitionCoordinator?.decor?.isAttachedToWindow == true) {
transitionCoordinator.startExit()
transitionOptions = options
}
if (user == myUserHandle()) {
withContext(mainDispatcher) { context.startActivity(intent, options?.toBundle()) }
withContext(mainDispatcher) {
context.startActivity(intent, transitionOptions?.toBundle())
}
} else {
launchCrossProfileIntent(user, intent, options?.toBundle())
launchCrossProfileIntent(user, intent, transitionOptions?.toBundle())
}
if (overrideTransition) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment