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

Commit 0b7a239a authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Create transition when converting an Activity to translucent" into... 

Merge "Create transition when converting an Activity to translucent" into udc-dev am: cf71476f am: 1200556f

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



Change-Id: Icdb0ddec6bcec14759968724791ef97ab5ed7088
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f8942d91 1200556f

services/core/java/com/android/server/wm/ActivityClientController.java

+2 −5
Original line number Diff line number Diff line
@@ -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);