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

Unverified Commit 3a0286d1 authored by Michael Bestas's avatar Michael Bestas
Browse files

fixup! fw/b: Button backlight brightness

Change-Id: Id5969a07c19010455031fe53d26f3d84216ef1e1
parent 74ea8c5a
Loading
Loading
Loading
Loading
+15 −0
Original line number Diff line number Diff line
@@ -93,6 +93,8 @@ import com.android.server.display.utils.SensorUtils;
import com.android.server.display.whitebalance.DisplayWhiteBalanceController;
import com.android.server.display.whitebalance.DisplayWhiteBalanceFactory;
import com.android.server.display.whitebalance.DisplayWhiteBalanceSettings;
import com.android.server.lights.LightsManager;
import com.android.server.lights.LogicalLight;
import com.android.server.policy.WindowManagerPolicy;

import lineageos.providers.LineageSettings;
@@ -241,6 +243,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
    @Nullable
    private final IBatteryStats mBatteryStats;

    // The lights manager.
    private final LightsManager mLights;

    // The sensor manager.
    private final SensorManager mSensorManager;

@@ -518,6 +523,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
        mTag = TAG + "[" + mDisplayId + "]";
        mThermalBrightnessThrottlingDataId =
                logicalDisplay.getDisplayInfoLocked().thermalBrightnessThrottlingDataId;
        mLights = LocalServices.getService(LightsManager.class);
        mDisplayDevice = mLogicalDisplay.getPrimaryDisplayDeviceLocked();
        mUniqueDisplayId = logicalDisplay.getPrimaryDisplayDeviceLocked().getUniqueId();
        mDisplayStatsId = mUniqueDisplayId.hashCode();
@@ -1391,6 +1397,15 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
        final boolean userSetBrightnessChanged = mDisplayBrightnessController
                .updateUserSetScreenBrightness();

        // Disable button lights when screen off or dozing
        if (state == Display.STATE_OFF || state == Display.STATE_DOZE ||
                state == Display.STATE_DOZE_SUSPEND) {
            LogicalLight buttonsLight = mLights.getLight(LightsManager.LIGHT_ID_BUTTONS);
            if (buttonsLight != null) {
                buttonsLight.setBrightness(PowerManager.BRIGHTNESS_OFF_FLOAT);
            }
        }

        DisplayBrightnessState displayBrightnessState = mDisplayBrightnessController
                .updateBrightness(mPowerRequest, state);
        float brightnessState = displayBrightnessState.getBrightness();