From 636bdfc6a9296a4886432b32e946c41930bd3a3e Mon Sep 17 00:00:00 2001 From: Fiona Campbell Date: Tue, 27 Oct 2020 13:37:11 +0000 Subject: [PATCH] Return to using brightness ramp values from config ag/9684175 mistakenly hardcoded the brightness slow & fast ramp animation speeds - use values from config.xml again. Bug: none? Test: manual Change-Id: Ic516c6df7532d5205605544d8df7ea121cf7f381 --- .../android/server/display/DisplayPowerController.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index 0211876c864d9..3994b5daac9ce 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -328,8 +328,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call private BrightnessReason mBrightnessReasonTemp = new BrightnessReason(); // Brightness animation ramp rates in brightness units per second - private final float mBrightnessRampRateSlow = 0.2352941f; - private final float mBrightnessRampRateFast = 0.7058823f; + private final float mBrightnessRampRateSlow; + private final float mBrightnessRampRateFast; // Whether or not to skip the initial brightness ramps into STATE_ON. @@ -454,6 +454,10 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call mAllowAutoBrightnessWhileDozingConfig = resources.getBoolean( com.android.internal.R.bool.config_allowAutoBrightnessWhileDozing); + mBrightnessRampRateFast = BrightnessSynchronizer.brightnessIntToFloat(resources.getInteger( + com.android.internal.R.integer.config_brightness_ramp_rate_fast)); + mBrightnessRampRateSlow = BrightnessSynchronizer.brightnessIntToFloat(resources.getInteger( + com.android.internal.R.integer.config_brightness_ramp_rate_slow)); mSkipScreenOnBrightnessRamp = resources.getBoolean( com.android.internal.R.bool.config_skipScreenOnBrightnessRamp);