diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/Dimmer.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/Dimmer.java b/services/core/java/com/android/server/wm/Dimmer.java index d7667d8ce7a8..4f3ab8bbbe0a 100644 --- a/services/core/java/com/android/server/wm/Dimmer.java +++ b/services/core/java/com/android/server/wm/Dimmer.java @@ -349,7 +349,8 @@ class Dimmer { // Otherwise use the same duration as the animation on the WindowContainer AnimationAdapter animationAdapter = container.mSurfaceAnimator.getAnimation(); - return animationAdapter == null ? DEFAULT_DIM_ANIM_DURATION + final float durationScale = container.mWmService.getTransitionAnimationScaleLocked(); + return animationAdapter == null ? (long) (DEFAULT_DIM_ANIM_DURATION * durationScale) : animationAdapter.getDurationHint(); } |