commit d85bed510fd1aad7f5d764b9fb6ddfea3e5bb56e
author Sunny Goyal <sunnygoyal@google.com> Tue Sep 25 12:01:01 2018 -0700
committer Sunny Goyal <sunnygoyal@google.com> Thu Oct 18 00:01:18 2018 +0000
tree a88308bee3d762aefad8b02e021d0143c1125bd5
parent 67f94b40024e07e64fd2875b7382b762805bebae

Adding support for cross-task hero transition

> Do not show starting window when using hero transition
> When running cross-task, only play the enter animation
> Allow transitions when using intent-sender

Bug: 113071278
Test: atest cts/tests/tests/transition/src/android/transition/cts/ActivityTransitionTest.java
atest cts/tests/tests/app.usage/src/android/app/usage/cts/ActivityTransitionTest.java

Change-Id: Id973d52412a9a2cde3ebcae3b718556c47dfff5d

services/core/java/com/android/server/am/ActivityRecord.java

diff --git a/services/core/java/com/android/server/am/ActivityRecord.java b/services/core/java/com/android/server/am/ActivityRecord.java
index 966cbd1..dce1dbb 100644
--- a/services/core/java/com/android/server/am/ActivityRecord.java
+++ b/services/core/java/com/android/server/am/ActivityRecord.java
@@ -2285,6 +2285,11 @@
             // We don't show starting window for overlay activities.
             return;
         }
+        if (pendingOptions != null
+                && pendingOptions.getAnimationType() == ActivityOptions.ANIM_SCENE_TRANSITION) {
+            // Don't show starting window when using shared element transition.
+            return;
+        }
 
         final CompatibilityInfo compatInfo =
                 service.compatibilityInfoForPackageLocked(info.applicationInfo);