Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tiger Huang
2023-06-01 08:33:43 +00:00
committed by Android (Google) Code Review
parent 390e76d7a4 8efc7aea52
commit 776832914b
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/window/TransitionInfo.java
View File

@@ -424,8 +424,8 @@ public final class TransitionInfo implements Parcelable {
case TRANSIT_NONE: return "NONE"; case TRANSIT_NONE: return "NONE";
case TRANSIT_OPEN: return "OPEN"; case TRANSIT_OPEN: return "OPEN";
case TRANSIT_CLOSE: return "CLOSE"; case TRANSIT_CLOSE: return "CLOSE";
case TRANSIT_TO_FRONT: return "SHOW"; case TRANSIT_TO_FRONT: return "TO_FRONT";
case TRANSIT_TO_BACK: return "HIDE"; case TRANSIT_TO_BACK: return "TO_BACK";
case TRANSIT_CHANGE: return "CHANGE"; case TRANSIT_CHANGE: return "CHANGE";
default: return "<unknown:" + mode + ">"; default: return "<unknown:" + mode + ">";
} }

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

@@ -29,6 +29,7 @@ import static android.view.WindowManager.TRANSIT_TO_FRONT;
import static android.view.WindowManager.fixScale; import static android.view.WindowManager.fixScale;
import static android.window.TransitionInfo.FLAG_IS_OCCLUDED; import static android.window.TransitionInfo.FLAG_IS_OCCLUDED;
import static android.window.TransitionInfo.FLAG_IS_WALLPAPER; 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_NO_ANIMATION;
import static android.window.TransitionInfo.FLAG_STARTING_WINDOW_TRANSFER_RECIPIENT; import static android.window.TransitionInfo.FLAG_STARTING_WINDOW_TRANSFER_RECIPIENT;
@@ -554,7 +555,10 @@ public class Transitions implements RemoteCallable<Transitions>,
layer = -zSplitLine - i; layer = -zSplitLine - i;
} }
} else if (mode == TRANSIT_OPEN || mode == TRANSIT_TO_FRONT) { } 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 // put on top
layer = zSplitLine + numChanges - i; layer = zSplitLine + numChanges - i;
} else { } else {