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

Merge "Fix brightness slider - allow minimum value" into rvc-dev am: ea14720b8a am: 99982e5bcb

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11791084

Change-Id: I1877d2dde538b92cdcbffae2047da0d6699819bc
This commit is contained in:
Fiona Campbell
2020-06-09 09:44:17 +00:00
committed by Automerger Merge Worker
parent 57c0dee5d7 99982e5bcb
commit 8328fa8746
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/display/BrightnessMappingStrategy.java
View File

@@ -28,6 +28,7 @@ import android.util.Pair;
import android.util.Slog; import android.util.Slog;
import android.util.Spline; import android.util.Spline;
import com.android.internal.BrightnessSynchronizer;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.Preconditions; import com.android.internal.util.Preconditions;
import com.android.server.display.utils.Plog; import com.android.server.display.utils.Plog;
@@ -348,9 +349,9 @@ public abstract class BrightnessMappingStrategy {
// Normalize entire brightness range to 0 - 1. // Normalize entire brightness range to 0 - 1.
protected static float normalizeAbsoluteBrightness(int brightness) { protected static float normalizeAbsoluteBrightness(int brightness) {
brightness = MathUtils.constrain(brightness, return BrightnessSynchronizer.brightnessIntToFloat(brightness,
PowerManager.BRIGHTNESS_OFF, PowerManager.BRIGHTNESS_ON); PowerManager.BRIGHTNESS_OFF + 1, PowerManager.BRIGHTNESS_ON,
return (float) brightness / PowerManager.BRIGHTNESS_ON; PowerManager.BRIGHTNESS_MIN, PowerManager.BRIGHTNESS_MAX);
} }
private Pair<float[], float[]> insertControlPoint( private Pair<float[], float[]> insertControlPoint(