Skip to content
Commit 73488550 authored by Josh Yang's avatar Josh Yang
Browse files

Allow ActivityOptions remote animation override per-display remote

animation.

Double check if there is already a remote animation override before
applying the override from AppTransitionController.

We have a global RA adapter registered via
ActivityTaskManager.registerRemoteAnimationsForDisplay(),
which will be passed to
AppTransitionController.mRemoteAnimationDefinition.
It seems that when we have another adapter passed via
ActivityOptions, it will be delivered to
AppTransition.overridePendingAppTransitionRemote().
We want to allow the 2nd RA take precedence over the 1st RA. This CL
does so by not passing AppTransitionController's RA adapter to
AppTransition if AppTransition already has a RA adapter.

Bug: 195674714
Fix: 195674714
Test: manually tested
Change-Id: I076c2d2fb304d1032725143b00c0981319bf9f25
(cherry picked from commit 9c0f2376e2b9e40a6cd63a116b3d0d684baafb54)
parent fbd41cbe
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment