Merge "Only cancel recent animation for change transition including display" into udc-qpr-dev am: ca88ae4d1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24297053 Change-Id: Ie51622a2957aaf8e60e3bda4eff024865cb1ab0d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -604,7 +604,8 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler {
|
||||
} else if (change.getMode() == TRANSIT_CHANGE) {
|
||||
// Finish recents animation if the display is changed, so the default
|
||||
// transition handler can play the animation such as rotation effect.
|
||||
if (change.hasFlags(TransitionInfo.FLAG_IS_DISPLAY)) {
|
||||
if (change.hasFlags(TransitionInfo.FLAG_IS_DISPLAY)
|
||||
&& info.getType() == TRANSIT_CHANGE) {
|
||||
// This call to cancel will use the screenshots taken preemptively in
|
||||
// handleMidTransitionRequest() prior to the display changing
|
||||
cancel(mWillFinishToHome, true /* withScreenshots */, "display change");
|
||||
|
||||
Reference in New Issue
Block a user