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

Merge "Create transition when converting an Activity to translucent" into udc-dev am: cf71476fd8 am: 2e6da43dd2

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

Change-Id: Iee2c8bcd9fd154eff50d2b6803a3cfd22191eabe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Louis Chang
2023-04-24 04:22:55 +00:00
committed by Automerger Merge Worker
parent baaf25db7f 2e6da43dd2
commit f5520e6e9f
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/wm/ActivityClientController.java
View File

@@ -807,11 +807,8 @@ class ActivityClientController extends IActivityClientController.Stub {
if (under != null) {
under.returningOptions = safeOptions != null ? safeOptions.getOptions(r) : null;
}
// Create a transition if the activity is playing in case the current activity
// didn't commit invisible. That's because if this activity has changed its
// visibility while playing transition, there won't able to commit visibility until
// the running transition finish.
final Transition transition = r.mTransitionController.inPlayingTransition(r)
// Create a transition to make sure the activity change is collected.
final Transition transition = r.mTransitionController.isShellTransitionsEnabled()
&& !r.mTransitionController.isCollecting()
? r.mTransitionController.createTransition(TRANSIT_TO_FRONT) : null;
final boolean changed = r.setOccludesParent(false);