commit | 3c0c818970007f31f69fa61ac3b19b77f8b2aad1 | [log] [tgz] |
---|---|---|
author | Jorim Jaggi <jjaggi@google.com> | Fri Mar 09 16:50:42 2018 +0100 |
committer | Jorim Jaggi <jjaggi@google.com> | Fri Mar 16 14:18:56 2018 +0100 |
tree | 92c31fa0b05d0b6920967589bc10dccb890eeaaa | |
parent | 3025fb5c8d3d05c0f50452d3071030675e622d31 [diff] |
Only use remote animation definition for ACTIVITY_TYPE_STANDARD So we don't override any other animations, like for the assistant. Change-Id: Ia9b7938d40ebfe29de1ef3eb730f798e2bb5f157 Fixes: 72702760 Test: Open/close assistant
diff --git a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java index a7e75bf..30e8c88 100644 --- a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java +++ b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
@@ -773,6 +773,7 @@ try { RemoteAnimationDefinitionCompat definition = new RemoteAnimationDefinitionCompat(); definition.addRemoteAnimation(WindowManagerWrapper.TRANSIT_WALLPAPER_OPEN, + WindowManagerWrapper.ACTIVITY_TYPE_STANDARD, new RemoteAnimationAdapterCompat(getWallpaperOpenRunner(), CLOSING_TRANSITION_DURATION_MS, 0 /* statusBarTransitionDelay */));