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

Merge "Ignore overriding pending animaiton for unlock transition." into tm-dev am: 6eaacb50f2

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

Change-Id: I59e431bcba0afb69252a3e7955ed0cde49c6b8c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Issei Suzuki
2022-06-22 21:36:47 +00:00
committed by Automerger Merge Worker
parent fe85cf4479 6eaacb50f2
commit 3857e88905
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/wm/AppTransitionController.java
View File

@@ -113,7 +113,6 @@ public class AppTransitionController {
private final DisplayContent mDisplayContent; private final DisplayContent mDisplayContent;
private final WallpaperController mWallpaperControllerLocked; private final WallpaperController mWallpaperControllerLocked;
private RemoteAnimationDefinition mRemoteAnimationDefinition = null; private RemoteAnimationDefinition mRemoteAnimationDefinition = null;
private static final int KEYGUARD_GOING_AWAY_ANIMATION_DURATION = 400;
private static final int TYPE_NONE = 0; private static final int TYPE_NONE = 0;
private static final int TYPE_ACTIVITY = 1; private static final int TYPE_ACTIVITY = 1;
@@ -716,14 +715,17 @@ public class AppTransitionController {
*/ */
private void overrideWithRemoteAnimationIfSet(@Nullable ActivityRecord animLpActivity, private void overrideWithRemoteAnimationIfSet(@Nullable ActivityRecord animLpActivity,
@TransitionOldType int transit, ArraySet<Integer> activityTypes) { @TransitionOldType int transit, ArraySet<Integer> activityTypes) {
RemoteAnimationAdapter adapter = null;
if (transit == TRANSIT_OLD_CRASHING_ACTIVITY_CLOSE) { if (transit == TRANSIT_OLD_CRASHING_ACTIVITY_CLOSE) {
// The crash transition has higher priority than any involved remote animations. // The crash transition has higher priority than any involved remote animations.
return; } else if (AppTransition.isKeyguardGoingAwayTransitOld(transit)) {
adapter = mRemoteAnimationDefinition != null
? mRemoteAnimationDefinition.getAdapter(transit, activityTypes)
: null;
} else if (mDisplayContent.mAppTransition.getRemoteAnimationController() == null) {
adapter = getRemoteAnimationOverride(animLpActivity, transit, activityTypes);
} }
final RemoteAnimationAdapter adapter = if (adapter != null) {
getRemoteAnimationOverride(animLpActivity, transit, activityTypes);
if (adapter != null
&& mDisplayContent.mAppTransition.getRemoteAnimationController() == null) {
mDisplayContent.mAppTransition.overridePendingAppTransitionRemote(adapter); mDisplayContent.mAppTransition.overridePendingAppTransitionRemote(adapter);
} }
} }