Merge "Set EvenDimmer to true by default" into main (9d2f2865) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/display/brightness/clamper/BrightnessClamperController.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -285,7 +285,8 @@ public class BrightnessClamperController {
		List<BrightnessStateModifier> modifiers = new ArrayList<>();
		modifiers.add(new DisplayDimModifier(context));
		modifiers.add(new BrightnessLowPowerModeModifier());
		if (flags.isEvenDimmerEnabled() && displayDeviceConfig != null) {
		if (flags.isEvenDimmerEnabled() && displayDeviceConfig != null
		&& displayDeviceConfig.isEvenDimmerAvailable()) {
		modifiers.add(new BrightnessLowLuxModifier(handler, listener, context,
		displayDeviceConfig));
		}

+12 −3

Original line number	Diff line number	Diff line
		@@ -87,9 +87,7 @@ public class BrightnessLowLuxModifier extends BrightnessModifier {
		mContentResolver, Settings.Secure.EVEN_DIMMER_MIN_NITS,
		/* def= */ MIN_NITS_DEFAULT, userId);

		boolean isActive = Settings.Secure.getFloatForUser(mContentResolver,
		Settings.Secure.EVEN_DIMMER_ACTIVATED,
		/* def= */ 0, userId) == 1.0f && mAutoBrightnessEnabled;
		boolean isActive = isSettingEnabled() && mAutoBrightnessEnabled;

		float luxBasedNitsLowerBound = mDisplayDeviceConfig.getMinNitsFromLux(mAmbientLux);

		@@ -202,6 +200,17 @@ public class BrightnessLowLuxModifier extends BrightnessModifier {
		pw.println(" mMinNitsAllowed=" + mMinNitsAllowed);
		}

		/**
		* Defaults to true, on devices where setting is unset.
		*
		* @return if setting indicates feature is enabled
		*/
		private boolean isSettingEnabled() {
		return Settings.Secure.getFloatForUser(mContentResolver,
		Settings.Secure.EVEN_DIMMER_ACTIVATED,
		/* def= */ 1.0f, UserHandle.USER_CURRENT) == 1.0f;
		}

		private float getBrightnessFromNits(float nits) {
		return mDisplayDeviceConfig.getBrightnessFromBacklight(
		mDisplayDeviceConfig.getBacklightFromNits(nits));