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

Commit 964c1a48 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 udc-dev am: cf71476f 

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



Change-Id: I909bc904eba3870a5ae307b05c5c0d82e15d6ab0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1a3743ee cf71476f

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

+2 −5
Original line number Original line Diff line number Diff line
@@ -807,11 +807,8 @@ class ActivityClientController extends IActivityClientController.Stub { 
                if (under != null) {

                if (under != null) {

                    under.returningOptions = safeOptions != null ? safeOptions.getOptions(r) : null;

                    under.returningOptions = safeOptions != null ? safeOptions.getOptions(r) : null;

                }

                }

                // Create a transition if the activity is playing in case the current activity

                // Create a transition to make sure the activity change is collected.

                // didn't commit invisible. That's because if this activity has changed its

                final Transition transition = r.mTransitionController.isShellTransitionsEnabled()

                // visibility while playing transition, there won't able to commit visibility until

                // the running transition finish.

                final Transition transition = r.mTransitionController.inPlayingTransition(r)

                        && !r.mTransitionController.isCollecting()

                        && !r.mTransitionController.isCollecting()

                        ? r.mTransitionController.createTransition(TRANSIT_TO_FRONT) : null;

                        ? r.mTransitionController.createTransition(TRANSIT_TO_FRONT) : null;

                final boolean changed = r.setOccludesParent(false);

                final boolean changed = r.setOccludesParent(false);