Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16756ae8 authored by Fiona Campbell's avatar Fiona Campbell Committed by Automerger Merge Worker
Browse files

Merge "Fix brightness slider - allow minimum value" into rvc-dev am: ea14720b 

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

Change-Id: I57e856d271c44d8900e05580cbe0a2b6e1970e00
parents 899b6c01 ea14720b

services/core/java/com/android/server/display/BrightnessMappingStrategy.java

+4 −3
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.util.Pair; 
import android.util.Slog;

import android.util.Spline;



import com.android.internal.BrightnessSynchronizer;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.Preconditions;

import com.android.server.display.utils.Plog;
@@ -348,9 +349,9 @@ public abstract class BrightnessMappingStrategy { 


    // Normalize entire brightness range to 0 - 1.

    protected static float normalizeAbsoluteBrightness(int brightness) {

        brightness = MathUtils.constrain(brightness,

                PowerManager.BRIGHTNESS_OFF, PowerManager.BRIGHTNESS_ON);

        return (float) brightness / PowerManager.BRIGHTNESS_ON;

        return BrightnessSynchronizer.brightnessIntToFloat(brightness,

                PowerManager.BRIGHTNESS_OFF + 1, PowerManager.BRIGHTNESS_ON,

                PowerManager.BRIGHTNESS_MIN, PowerManager.BRIGHTNESS_MAX);

    }



    private Pair<float[], float[]> insertControlPoint(