From 7b83b42858abdb77704095a4c3a35d926e3a5092 Mon Sep 17 00:00:00 2001 From: Christine Franks Date: Wed, 18 Jan 2017 14:55:00 -0800 Subject: [PATCH] Increase Night Display transition to 3 seconds Bug: 34287165 Test: manual - Night Display transitions to amber/transparent over three seconds. Change-Id: Ia39d162ffdafb5e8920a0e392dc913d849453169 --- .../com/android/server/display/NightDisplayService.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/display/NightDisplayService.java b/services/core/java/com/android/server/display/NightDisplayService.java index 0ec48b992b1e6..0357b1b429356 100644 --- a/services/core/java/com/android/server/display/NightDisplayService.java +++ b/services/core/java/com/android/server/display/NightDisplayService.java @@ -74,6 +74,11 @@ public final class NightDisplayService extends SystemService 0, 0, 0, 1 }; + /** + * The transition time, in milliseconds, for Night Display to turn on/off. + */ + private static final long TRANSITION_DURATION = 3000L; + /** * The identity matrix, used if one of the given matrices is {@code null}. */ @@ -285,8 +290,7 @@ public final class NightDisplayService extends SystemService mColorMatrixAnimator = ValueAnimator.ofObject(COLOR_MATRIX_EVALUATOR, from == null ? MATRIX_IDENTITY : from, to == null ? MATRIX_IDENTITY : to); - mColorMatrixAnimator.setDuration(getContext().getResources() - .getInteger(android.R.integer.config_longAnimTime)); + mColorMatrixAnimator.setDuration(TRANSITION_DURATION); mColorMatrixAnimator.setInterpolator(AnimationUtils.loadInterpolator( getContext(), android.R.interpolator.fast_out_slow_in)); mColorMatrixAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {