PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Catalyst] Use range int type for BrightnessLevelPreference

Browse Source 
NO_IFTTT=Catalyst only

Bug: 375895862
Flag: com.android.settings.flags.catalyst_display_settings_screen
Test: devtool
Change-Id: I1f5becd58e63183a56360b355d8bf753de81242f
This commit is contained in:
Jacky Wang
2024-12-31 10:38:30 +08:00
parent 7938eeb0d4
commit 90ee129baf
1 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/com/android/settings/display/BrightnessLevelPreference.kt
View File

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