Merge "[Catalyst] Update RangeValue usages to IntRangeValuePreference" into main (12a64f35) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/display/BrightnessLevelPreference.kt

+2 −4

Original line number	Diff line number	Diff line
		@@ -41,11 +41,10 @@ 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.PersistentPreference
		import com.android.settingslib.metadata.IntRangeValuePreference
		import com.android.settingslib.metadata.PreferenceChangeReason
		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
		@@ -55,8 +54,7 @@ import java.text.NumberFormat

		// LINT.IfChange
		class BrightnessLevelPreference :
		PersistentPreference<Int>,
		RangeValue,
		IntRangeValuePreference,
		PreferenceBinding,
		PreferenceRestrictionMixin,
		PreferenceSummaryProvider,

+3 −5

Original line number	Diff line number	Diff line
		@@ -26,11 +26,10 @@ import com.android.settingslib.datastore.KeyValueStore
		import com.android.settingslib.datastore.NoOpKeyedObservable
		import com.android.settingslib.datastore.Permissions
		import com.android.settingslib.fuelgauge.BatteryUtils
		import com.android.settingslib.metadata.PersistentPreference
		import com.android.settingslib.metadata.IntRangeValuePreference
		import com.android.settingslib.metadata.PreferenceLifecycleContext
		import com.android.settingslib.metadata.PreferenceLifecycleProvider
		import com.android.settingslib.metadata.PreferenceMetadata
		import com.android.settingslib.metadata.RangeValue
		import com.android.settingslib.metadata.ReadWritePermit
		import com.android.settingslib.metadata.SensitivityLevel
		import com.android.settingslib.preference.PreferenceBinding
		@@ -38,10 +37,9 @@ import com.android.settingslib.widget.UsageProgressBarPreference

		// LINT.IfChange
		class BatteryHeaderPreference :
		PersistentPreference<Int>,
		IntRangeValuePreference,
		PreferenceBinding,
		PreferenceLifecycleProvider,
		RangeValue {
		PreferenceLifecycleProvider {

		@VisibleForTesting var batteryBroadcastReceiver: BatteryBroadcastReceiver? = null

+2 −4

Original line number	Diff line number	Diff line
		@@ -32,20 +32,18 @@ import com.android.settingslib.datastore.KeyValueStore
		import com.android.settingslib.datastore.NoOpKeyedObservable
		import com.android.settingslib.datastore.Permissions
		import com.android.settingslib.datastore.and
		import com.android.settingslib.metadata.PersistentPreference
		import com.android.settingslib.metadata.IntRangeValuePreference
		import com.android.settingslib.metadata.PreferenceAvailabilityProvider
		import com.android.settingslib.metadata.PreferenceIconProvider
		import com.android.settingslib.metadata.PreferenceMetadata
		import com.android.settingslib.metadata.RangeValue
		import com.android.settingslib.metadata.ReadWritePermit
		import com.android.settingslib.metadata.SensitivityLevel
		import com.android.settingslib.preference.PreferenceBinding

		// LINT.IfChange
		open class CallVolumePreference :
		IntRangeValuePreference,
		PreferenceBinding,
		PersistentPreference<Int>,
		RangeValue,
		PreferenceAvailabilityProvider,
		PreferenceIconProvider,
		PreferenceRestrictionMixin {

+2 −4

Original line number	Diff line number	Diff line
		@@ -29,20 +29,18 @@ import com.android.settingslib.datastore.KeyValueStore
		import com.android.settingslib.datastore.NoOpKeyedObservable
		import com.android.settingslib.datastore.Permissions
		import com.android.settingslib.datastore.and
		import com.android.settingslib.metadata.PersistentPreference
		import com.android.settingslib.metadata.IntRangeValuePreference
		import com.android.settingslib.metadata.PreferenceAvailabilityProvider
		import com.android.settingslib.metadata.PreferenceIconProvider
		import com.android.settingslib.metadata.PreferenceMetadata
		import com.android.settingslib.metadata.RangeValue
		import com.android.settingslib.metadata.ReadWritePermit
		import com.android.settingslib.metadata.SensitivityLevel
		import com.android.settingslib.preference.PreferenceBinding

		// LINT.IfChange
		open class MediaVolumePreference :
		IntRangeValuePreference,
		PreferenceBinding,
		PersistentPreference<Int>,
		RangeValue,
		PreferenceAvailabilityProvider,
		PreferenceIconProvider,
		PreferenceRestrictionMixin {

+2 −4

Original line number	Diff line number	Diff line
		@@ -45,22 +45,20 @@ import com.android.settingslib.datastore.KeyValueStore
		import com.android.settingslib.datastore.NoOpKeyedObservable
		import com.android.settingslib.datastore.Permissions
		import com.android.settingslib.datastore.and
		import com.android.settingslib.metadata.PersistentPreference
		import com.android.settingslib.metadata.IntRangeValuePreference
		import com.android.settingslib.metadata.PreferenceAvailabilityProvider
		import com.android.settingslib.metadata.PreferenceIconProvider
		import com.android.settingslib.metadata.PreferenceLifecycleContext
		import com.android.settingslib.metadata.PreferenceLifecycleProvider
		import com.android.settingslib.metadata.PreferenceMetadata
		import com.android.settingslib.metadata.RangeValue
		import com.android.settingslib.metadata.ReadWritePermit
		import com.android.settingslib.metadata.SensitivityLevel
		import com.android.settingslib.preference.PreferenceBinding

		// LINT.IfChange
		open class SeparateRingVolumePreference :
		IntRangeValuePreference,
		PreferenceBinding,
		PersistentPreference<Int>,
		RangeValue,
		PreferenceAvailabilityProvider,
		PreferenceIconProvider,
		PreferenceLifecycleProvider,