diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/AppTransitionController.java | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/WallpaperController.java | 14 |
2 files changed, 8 insertions, 7 deletions
diff --git a/services/core/java/com/android/server/wm/AppTransitionController.java b/services/core/java/com/android/server/wm/AppTransitionController.java index 6a47c9e217f8..654ccc80f8a8 100644 --- a/services/core/java/com/android/server/wm/AppTransitionController.java +++ b/services/core/java/com/android/server/wm/AppTransitionController.java @@ -618,6 +618,7 @@ public class AppTransitionController { Animation anim = mService.mPolicy.createKeyguardWallpaperExit( (flags & TRANSIT_FLAG_KEYGUARD_GOING_AWAY_TO_SHADE) != 0); if (anim != null) { + anim.scaleCurrentDuration(mService.getTransitionAnimationScaleLocked()); mDisplayContent.mWallpaperController.startWallpaperAnimation(anim); } } diff --git a/services/core/java/com/android/server/wm/WallpaperController.java b/services/core/java/com/android/server/wm/WallpaperController.java index 57d0a335a688..29a2e18f46a8 100644 --- a/services/core/java/com/android/server/wm/WallpaperController.java +++ b/services/core/java/com/android/server/wm/WallpaperController.java @@ -142,11 +142,13 @@ class WallpaperController { mFindResults.setUseTopWallpaperAsTarget(true); } - final boolean keyguardGoingAwayWithWallpaper = (w.mActivityRecord != null - && w.mActivityRecord.isAnimating(TRANSITION | PARENTS) - && AppTransition.isKeyguardGoingAwayTransit(w.mActivityRecord.getTransit()) - && (w.mActivityRecord.getTransitFlags() - & TRANSIT_FLAG_KEYGUARD_GOING_AWAY_WITH_WALLPAPER) != 0); + final WindowContainer animatingContainer = w.mActivityRecord != null + ? w.mActivityRecord.getAnimatingContainer() : null; + final boolean keyguardGoingAwayWithWallpaper = (animatingContainer != null + && animatingContainer.isAnimating(TRANSITION | PARENTS) + && AppTransition.isKeyguardGoingAwayTransit(animatingContainer.mTransit) + && (animatingContainer.mTransitFlags + & TRANSIT_FLAG_KEYGUARD_GOING_AWAY_WITH_WALLPAPER) != 0); boolean needsShowWhenLockedWallpaper = false; if ((w.mAttrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0 @@ -166,8 +168,6 @@ class WallpaperController { final RecentsAnimationController recentsAnimationController = mService.getRecentsAnimationController(); - final WindowContainer animatingContainer = - w.mActivityRecord != null ? w.mActivityRecord.getAnimatingContainer() : null; final boolean animationWallpaper = animatingContainer != null && animatingContainer.getAnimation() != null && animatingContainer.getAnimation().getShowWallpaper(); |