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

Merge changes from topic "presubmit-am-feedd56083be48668fea14c29cf72287" into sc-v2-dev-plus-aosp

Browse Source 
* changes:
  [automerge] [RESTRICT AUTOMERGE]DisplayManager: Make sure RampAnimator sets property in linear space. 2p: 47461bb5ae
  [RESTRICT AUTOMERGE]DisplayManager: Make sure RampAnimator sets property in linear space.
This commit is contained in:
Chris Kuiper
2022-02-06 00:27:14 +00:00
committed by Android (Google) Code Review
parent fc672e4459 5ca98c6bd6
commit 01ecac9813
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/display/RampAnimator.java
View File

@@ -70,7 +70,7 @@ class RampAnimator<T> {
mRate = 0; mRate = 0;
mTargetValue = target; mTargetValue = target;
mCurrentValue = target; mCurrentValue = target;
mProperty.setValue(mObject, target); setPropertyValue(target);
if (mAnimating) { if (mAnimating) {
mAnimating = false; mAnimating = false;
cancelAnimationCallback(); cancelAnimationCallback();
@@ -125,6 +125,15 @@ class RampAnimator<T> {
mListener = listener; mListener = listener;
} }
/**
* Sets the brightness property by converting the given value from HLG space
* into linear space.
*/
private void setPropertyValue(float val) {
final float linearVal = BrightnessUtils.convertGammaToLinear(val);
mProperty.setValue(mObject, linearVal);
}
private void postAnimationCallback() { private void postAnimationCallback() {
mChoreographer.postCallback(Choreographer.CALLBACK_ANIMATION, mAnimationCallback, null); mChoreographer.postCallback(Choreographer.CALLBACK_ANIMATION, mAnimationCallback, null);
} }
@@ -160,9 +169,7 @@ class RampAnimator<T> {
final float oldCurrentValue = mCurrentValue; final float oldCurrentValue = mCurrentValue;
mCurrentValue = mAnimatedValue; mCurrentValue = mAnimatedValue;
if (oldCurrentValue != mCurrentValue) { if (oldCurrentValue != mCurrentValue) {
// Convert value from HLG into linear space for the property. setPropertyValue(mCurrentValue);
final float linearCurrentVal = BrightnessUtils.convertGammaToLinear(mCurrentValue);
mProperty.setValue(mObject, linearCurrentVal);
} }
if (mTargetValue != mCurrentValue) { if (mTargetValue != mCurrentValue) {
postAnimationCallback(); postAnimationCallback();