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

Commit 181d85d8 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 am: 8b3cb4cf 

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



Change-Id: I228da4d656836f6236b947450f980cc149a59f52
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0cd902a9 8b3cb4cf

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;

                }

            }