From 12cc80693696fcb27178fd55b25032a53047c82d Mon Sep 17 00:00:00 2001 From: Mill Chen Date: Thu, 24 Oct 2024 07:53:08 +0000 Subject: [Catalyst] Update RangeValue Bug: 332202168 Test: manual Flag: EXEMPT update library Change-Id: Ifbf8a0389e1c55f6746a48b63110885c3fea26c0 --- .../com/android/settingslib/metadata/PersistentPreference.kt | 10 +++++----- .../com/android/settingslib/preference/PreferenceBinding.kt | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/PersistentPreference.kt b/packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/PersistentPreference.kt index 51a85803c6ed..6c11e6997fba 100644 --- a/packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/PersistentPreference.kt +++ b/packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/PersistentPreference.kt @@ -161,14 +161,14 @@ interface DiscreteIntValue : DiscreteValue { /** Value is between a range. */ interface RangeValue : ValueDescriptor { /** The lower bound (inclusive) of the range. */ - val minValue: Int + fun getMinValue(context: Context): Int /** The upper bound (inclusive) of the range. */ - val maxValue: Int + fun getMaxValue(context: Context): Int /** The increment step within the range. 0 means unset, which implies step size is 1. */ - val incrementStep: Int - get() = 0 + fun getIncrementStep(context: Context) = 0 - override fun isValidValue(context: Context, index: Int) = index in minValue..maxValue + override fun isValidValue(context: Context, index: Int) = + index in getMinValue(context)..getMaxValue(context) } diff --git a/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBinding.kt b/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBinding.kt index ef3d372a4088..bcfef67032f1 100644 --- a/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBinding.kt +++ b/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBinding.kt @@ -101,9 +101,9 @@ interface PreferenceBinding { preference.setEntryValues(values) } } else if (preference is SeekBarPreference && this is RangeValue) { - preference.min = minValue - preference.max = maxValue - preference.seekBarIncrement = incrementStep + preference.min = getMinValue(context) + preference.max = getMaxValue(context) + preference.seekBarIncrement = getIncrementStep(context) } } } -- cgit v1.2.3-59-g8ed1b