From 90ee129baf2056cce5841d1fcca2d19eef8d903d Mon Sep 17 00:00:00 2001
From: Jacky Wang <jiannan@google.com>
Date: Tue, 31 Dec 2024 10:38:30 +0800
Subject: [PATCH] [Catalyst] Use range int type for BrightnessLevelPreference

NO_IFTTT=Catalyst only

Bug: 375895862
Flag: com.android.settings.flags.catalyst_display_settings_screen
Test: devtool
Change-Id: I1f5becd58e63183a56360b355d8bf753de81242f
---
 .../display/BrightnessLevelPreference.kt      | 42 +++++++++++--------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/com/android/settings/display/BrightnessLevelPreference.kt b/src/com/android/settings/display/BrightnessLevelPreference.kt
index 9dc68db7834..f87edcbe758 100644
--- a/src/com/android/settings/display/BrightnessLevelPreference.kt
+++ b/src/com/android/settings/display/BrightnessLevelPreference.kt
@@ -42,19 +42,22 @@ import com.android.settingslib.datastore.SettingsSystemStore
 import com.android.settingslib.display.BrightnessUtils.GAMMA_SPACE_MAX
 import com.android.settingslib.display.BrightnessUtils.GAMMA_SPACE_MIN
 import com.android.settingslib.display.BrightnessUtils.convertLinearToGammaFloat
-import com.android.settingslib.metadata.FloatPersistentPreference
+import com.android.settingslib.metadata.PersistentPreference
 import com.android.settingslib.metadata.PreferenceMetadata
 import com.android.settingslib.metadata.PreferenceSummaryProvider
+import com.android.settingslib.metadata.RangeValue
 import com.android.settingslib.metadata.ReadWritePermit
 import com.android.settingslib.metadata.SensitivityLevel
 import com.android.settingslib.preference.PreferenceBinding
 import com.android.settingslib.transition.SettingsTransitionHelper
+import java.math.BigDecimal
 import java.text.NumberFormat
 
 // LINT.IfChange
 class BrightnessLevelPreference :
     PreferenceMetadata,
-    FloatPersistentPreference,
+    PersistentPreference<Int>,
+    RangeValue,
     PreferenceBinding,
     PreferenceRestrictionMixin,
     PreferenceSummaryProvider,
@@ -70,7 +73,7 @@ class BrightnessLevelPreference :
         get() = R.string.keywords_display_brightness_level
 
     override fun getSummary(context: Context): CharSequence? =
-        NumberFormat.getPercentInstance().format(context.brightness)
+        NumberFormat.getPercentInstance().format(context.brightnessPercent)
 
     override fun isEnabled(context: Context) = super<PreferenceRestrictionMixin>.isEnabled(context)
 
@@ -105,7 +108,7 @@ class BrightnessLevelPreference :
     override fun getReadPermit(context: Context, callingPid: Int, callingUid: Int) =
         ReadWritePermit.ALLOW
 
-    override fun getWritePermit(context: Context, value: Float?, callingPid: Int, callingUid: Int) =
+    override fun getWritePermit(context: Context, value: Int?, callingPid: Int, callingUid: Int) =
         ReadWritePermit.DISALLOW
 
     override val sensitivityLevel
@@ -113,6 +116,10 @@ class BrightnessLevelPreference :
 
     override fun storage(context: Context): KeyValueStore = BrightnessStorage(context)
 
+    override fun getMinValue(context: Context) = 0
+
+    override fun getMaxValue(context: Context) = 100
+
     private class BrightnessStorage(private val context: Context) :
         AbstractKeyedDataObservable<String>(),
         KeyValueStore,
@@ -123,7 +130,9 @@ class BrightnessLevelPreference :
 
         @Suppress("UNCHECKED_CAST")
         override fun <T : Any> getValue(key: String, valueType: Class<T>) =
-            context.brightness.toFloat() as T
+            BigDecimal(context.brightnessPercent * 100)
+                .setScale(0, NumberFormat.getPercentInstance().roundingMode)
+                .toInt() as T
 
         override fun <T : Any> setValue(key: String, valueType: Class<T>, value: T?) {}
 
@@ -134,7 +143,7 @@ class BrightnessLevelPreference :
             context.displayManager.registerDisplayListener(
                 this,
                 HandlerExecutor.main,
-                /* eventFlags= */ 0,
+                /* eventFilter= */ 0,
                 DisplayManager.PRIVATE_EVENT_TYPE_DISPLAY_BRIGHTNESS,
             )
         }
@@ -176,21 +185,20 @@ class BrightnessLevelPreference :
         private val Context.displayManager: DisplayManager
             get() = getSystemService(DisplayManager::class.java)!!
 
-        private val Context.brightness: Double
+        private val Context.brightnessPercent: Double
             get() {
-                val info: BrightnessInfo? = display.brightnessInfo
-                val value =
-                    info?.run {
-                        convertLinearToGammaFloat(brightness, brightnessMinimum, brightnessMaximum)
-                    }
-                return getPercentage(value?.toDouble() ?: 0.0)
+                val info: BrightnessInfo = display.brightnessInfo ?: return 0.0
+                return info.brightnessInGammaSpace.toPercentage()
             }
 
-        private fun getPercentage(value: Double): Double =
+        private val BrightnessInfo.brightnessInGammaSpace: Int
+            get() = convertLinearToGammaFloat(brightness, brightnessMinimum, brightnessMaximum)
+
+        private fun Int.toPercentage(): Double =
             when {
-                value > GAMMA_SPACE_MAX -> 1.0
-                value < GAMMA_SPACE_MIN -> 0.0
-                else -> (value - GAMMA_SPACE_MIN) / (GAMMA_SPACE_MAX - GAMMA_SPACE_MIN)
+                this > GAMMA_SPACE_MAX -> 1.0
+                this < GAMMA_SPACE_MIN -> 0.0
+                else -> (this - GAMMA_SPACE_MIN).toDouble() / (GAMMA_SPACE_MAX - GAMMA_SPACE_MIN)
             }
     }
 }