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

Merge "Always show CHANGE containers in transition setup" into udc-dev am: 3376f68636

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

Change-Id: I328b7b78e13c9a9194939ab7c7ea0c89066dd365
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Evan Rosky
2023-05-19 21:13:32 +00:00
committed by Automerger Merge Worker
parent 0b754f6247 3376f68636
commit 664195f960
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -493,6 +493,9 @@ public final class TransitionInfo implements Parcelable {
if ((flags & FLAG_FIRST_CUSTOM) != 0) { if ((flags & FLAG_FIRST_CUSTOM) != 0) {
sb.append(sb.length() == 0 ? "" : "|").append("FIRST_CUSTOM"); sb.append(sb.length() == 0 ? "" : "|").append("FIRST_CUSTOM");
} }
if ((flags & FLAG_MOVED_TO_TOP) != 0) {
sb.append(sb.length() == 0 ? "" : "|").append("MOVE_TO_TOP");
}
return sb.toString(); return sb.toString();
} }

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

@@ -492,6 +492,10 @@ public class Transitions implements RemoteCallable<Transitions>,
finishT.show(leash); finishT.show(leash);
} else if (mode == TRANSIT_CLOSE || mode == TRANSIT_TO_BACK) { } else if (mode == TRANSIT_CLOSE || mode == TRANSIT_TO_BACK) {
finishT.hide(leash); finishT.hide(leash);
} else if (isOpening && mode == TRANSIT_CHANGE) {
// Just in case there is a race with another animation (eg. recents finish()).
// Changes are visible->visible so it's a problem if it isn't visible.
t.show(leash);
} }
} }
} }