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

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

Browse Source
This commit is contained in:
Evan Rosky
2023-05-18 23:40:14 +00:00
committed by Android (Google) Code Review
parent 2f1c0041f7 57b99a295f
commit f88472e18b
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,7 @@ package com.android.server.wm;
import static android.Manifest.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS; import static android.Manifest.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS;
import static android.app.Activity.FULLSCREEN_MODE_REQUEST_ENTER; 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_TASK_ID;
import static android.app.ActivityTaskManager.INVALID_WINDOWING_MODE; import static android.app.ActivityTaskManager.INVALID_WINDOWING_MODE;
import static android.app.FullscreenRequestHandler.REMOTE_CALLBACK_RESULT_KEY; import static android.app.FullscreenRequestHandler.REMOTE_CALLBACK_RESULT_KEY;
@@ -818,6 +819,13 @@ class ActivityClientController extends IActivityClientController.Stub {
null /*startTask */, null /* remoteTransition */, null /*startTask */, null /* remoteTransition */,
null /* displayChange */); null /* displayChange */);
r.mTransitionController.setReady(r.getDisplayContent()); 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 { } else {
transition.abort(); transition.abort();
} }