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

Commit 87a32f81 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Plumb the animation info from convertToTranslucent to transition" into... 

Merge "Plumb the animation info from convertToTranslucent to transition" into udc-dev am: f88472e1

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



Change-Id: I0ab9cfdc4b9c51abbaf2c051ec8bd37e91056e74
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents db077d5e f88472e1

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

+8 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.server.wm; 


import static android.Manifest.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS;

import static android.app.Activity.FULLSCREEN_MODE_REQUEST_ENTER;

import static android.app.ActivityOptions.ANIM_SCENE_TRANSITION;

import static android.app.ActivityTaskManager.INVALID_TASK_ID;

import static android.app.ActivityTaskManager.INVALID_WINDOWING_MODE;

import static android.app.FullscreenRequestHandler.REMOTE_CALLBACK_RESULT_KEY;
@@ -818,6 +819,13 @@ class ActivityClientController extends IActivityClientController.Stub { 
                                null /*startTask */, null /* remoteTransition */,

                                null /* displayChange */);

                        r.mTransitionController.setReady(r.getDisplayContent());

                        if (under != null && under.returningOptions != null

                                && under.returningOptions.getAnimationType()

                                        == ANIM_SCENE_TRANSITION) {

                            // Pass along the scene-transition animation-type

                            transition.setOverrideAnimation(TransitionInfo.AnimationOptions

                                    .makeSceneTransitionAnimOptions(), null, null);

                        }

                    } else {

                        transition.abort();

                    }