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

Commit b07bf84c authored by Tiger Huang's avatar Tiger Huang Committed by Automerger Merge Worker
Browse files

Merge "Put the change to top if it has FLAG_MOVED_TO_TOP" into udc-dev am:... 

Merge "Put the change to top if it has FLAG_MOVED_TO_TOP" into udc-dev am: 77683291 am: 0beba837

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



Change-Id: I249109046969d04cc7dc27a4738b2a09fd9c4a16
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 972f13ec 0beba837

core/java/android/window/TransitionInfo.java

+2 −2
Original line number Diff line number Diff line
@@ -424,8 +424,8 @@ public final class TransitionInfo implements Parcelable { 
            case TRANSIT_NONE: return "NONE";

            case TRANSIT_OPEN: return "OPEN";

            case TRANSIT_CLOSE: return "CLOSE";

            case TRANSIT_TO_FRONT: return "SHOW";

            case TRANSIT_TO_BACK: return "HIDE";

            case TRANSIT_TO_FRONT: return "TO_FRONT";

            case TRANSIT_TO_BACK: return "TO_BACK";

            case TRANSIT_CHANGE: return "CHANGE";

            default: return "<unknown:" + mode + ">";

        }

libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java

+5 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import static android.view.WindowManager.TRANSIT_TO_FRONT; 
import static android.view.WindowManager.fixScale;

import static android.window.TransitionInfo.FLAG_IS_OCCLUDED;

import static android.window.TransitionInfo.FLAG_IS_WALLPAPER;

import static android.window.TransitionInfo.FLAG_MOVED_TO_TOP;

import static android.window.TransitionInfo.FLAG_NO_ANIMATION;

import static android.window.TransitionInfo.FLAG_STARTING_WINDOW_TRANSFER_RECIPIENT;
@@ -554,7 +555,10 @@ public class Transitions implements RemoteCallable<Transitions>, 
                    layer = -zSplitLine - i;

                }

            } else if (mode == TRANSIT_OPEN || mode == TRANSIT_TO_FRONT) {

                if (isOpening) {

                if (isOpening

                        // This is for when an activity launches while a different transition is

                        // collecting.

                        || change.hasFlags(FLAG_MOVED_TO_TOP)) {

                    // put on top

                    layer = zSplitLine + numChanges - i;

                } else {