From 8443ce8f9a29391cd29ba1d39b5e31da40191ec7 Mon Sep 17 00:00:00 2001
From: Fiona Campbell <flc@google.com>
Date: Fri, 3 May 2024 14:50:11 +0000
Subject: [PATCH] Set EvenDimmer to true by default

- Read from setting with true as fallback

Bug: 336476693
Test: atest DisplayServiceTests
Test: manual up/downgrade with settings / off

Change-Id: I5279db2b35af9e84057d8f89bbbe9f26c62237c6
---
 .../settings/display/EvenDimmerPreferenceController.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/display/EvenDimmerPreferenceController.java b/src/com/android/settings/display/EvenDimmerPreferenceController.java
index 9f239b2e1ad..2a0f16d2987 100644
--- a/src/com/android/settings/display/EvenDimmerPreferenceController.java
+++ b/src/com/android/settings/display/EvenDimmerPreferenceController.java
@@ -18,6 +18,7 @@ package com.android.settings.display;
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.os.UserHandle;
 import android.provider.Settings;
 import android.util.Log;
 
@@ -79,7 +80,8 @@ public class EvenDimmerPreferenceController extends TogglePreferenceController {
     }
 
     private boolean getEvenDimmerActivated() {
-        return Settings.Secure.getFloat(mContext.getContentResolver(),
-                Settings.Secure.EVEN_DIMMER_ACTIVATED, 0) == 1;
+        return Settings.Secure.getFloatForUser(mContext.getContentResolver(),
+                Settings.Secure.EVEN_DIMMER_ACTIVATED,
+                /* def= */ 1.0f, UserHandle.USER_CURRENT) == 1.0f;
     }
 }