Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7f368f1 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Preempt recents animation if display is changed" into udc-dev am: fe69fc42 

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



Change-Id: Ic00e92958f92623b55aa1e881b0547ad0b7bde44
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 111e96d6 fe69fc42

packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteTransitionCompat.java

+7 −0
Original line number Diff line number Diff line
@@ -246,6 +246,13 @@ public class RemoteTransitionCompat { 
                        closingTasks.add(change);

                    }

                } 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)) {

                        mListener.onSwitchToScreenshot(() -> finish(false /* toHome */,

                                false /* userLeaveHint */));

                        return false;

                    }

                    hasChangingApp = true;

                }

            }