diff --git a/src/com/android/settings/accessibility/RemoveAnimationsPreference.kt b/src/com/android/settings/accessibility/RemoveAnimationsPreference.kt index 5b732bc32d1..65519e9ce37 100644 --- a/src/com/android/settings/accessibility/RemoveAnimationsPreference.kt +++ b/src/com/android/settings/accessibility/RemoveAnimationsPreference.kt @@ -28,6 +28,7 @@ import com.android.settingslib.datastore.SettingsGlobalStore import com.android.settingslib.metadata.PreferenceLifecycleContext import com.android.settingslib.metadata.PreferenceLifecycleProvider import com.android.settingslib.metadata.ReadWritePermit +import com.android.settingslib.metadata.SensitivityLevel import com.android.settingslib.metadata.SwitchPreference class RemoveAnimationsPreference : @@ -70,6 +71,9 @@ class RemoveAnimationsPreference : override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) = ReadWritePermit.ALLOW + override val sensitivityLevel + get() = SensitivityLevel.NO_SENSITIVITY + @Suppress("UNCHECKED_CAST") private class RemoveAnimationsStorage(private val context: Context) : NoOpKeyedObservable(), KeyValueStore { diff --git a/src/com/android/settings/datausage/DataSaverMainSwitchPreference.kt b/src/com/android/settings/datausage/DataSaverMainSwitchPreference.kt index de128e6401c..e4e38d42530 100644 --- a/src/com/android/settings/datausage/DataSaverMainSwitchPreference.kt +++ b/src/com/android/settings/datausage/DataSaverMainSwitchPreference.kt @@ -24,6 +24,7 @@ import com.android.settingslib.datastore.NoOpKeyedObservable import com.android.settingslib.metadata.PreferenceLifecycleContext import com.android.settingslib.metadata.PreferenceLifecycleProvider import com.android.settingslib.metadata.ReadWritePermit +import com.android.settingslib.metadata.SensitivityLevel class DataSaverMainSwitchPreference(context: Context) : MainSwitchBarMetadata, PreferenceLifecycleProvider { @@ -45,6 +46,9 @@ class DataSaverMainSwitchPreference(context: Context) : override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) = ReadWritePermit.ALLOW + override val sensitivityLevel + get() = SensitivityLevel.NO_SENSITIVITY + override fun onStart(context: PreferenceLifecycleContext) { val listener = DataSaverBackend.Listener { context.notifyPreferenceChange(KEY) } dataSaverBackendListener = listener diff --git a/src/com/android/settings/display/AdaptiveSleepPreference.kt b/src/com/android/settings/display/AdaptiveSleepPreference.kt index 71d7749eb9a..a1600017c35 100644 --- a/src/com/android/settings/display/AdaptiveSleepPreference.kt +++ b/src/com/android/settings/display/AdaptiveSleepPreference.kt @@ -37,6 +37,7 @@ import com.android.settingslib.metadata.PreferenceAvailabilityProvider import com.android.settingslib.metadata.PreferenceLifecycleContext import com.android.settingslib.metadata.PreferenceLifecycleProvider import com.android.settingslib.metadata.ReadWritePermit +import com.android.settingslib.metadata.SensitivityLevel import com.android.settingslib.metadata.TwoStatePreference import com.android.settingslib.preference.PreferenceBindingPlaceholder import com.android.settingslib.preference.SwitchPreferenceBinding @@ -82,6 +83,9 @@ class AdaptiveSleepPreference : override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) = ReadWritePermit.ALLOW + override val sensitivityLevel + get() = SensitivityLevel.NO_SENSITIVITY + @Suppress("UNCHECKED_CAST") private class Storage( private val context: Context, diff --git a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreference.kt b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreference.kt index 0537e625159..e50b00b6345 100644 --- a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreference.kt +++ b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreference.kt @@ -36,6 +36,7 @@ import com.android.settingslib.metadata.PreferenceLifecycleContext import com.android.settingslib.metadata.PreferenceLifecycleProvider import com.android.settingslib.metadata.PreferenceSummaryProvider import com.android.settingslib.metadata.ReadWritePermit +import com.android.settingslib.metadata.SensitivityLevel import com.android.settingslib.metadata.SwitchPreference // LINT.IfChange @@ -76,6 +77,9 @@ class AmbientDisplayAlwaysOnPreference : override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) = ReadWritePermit.ALLOW + override val sensitivityLevel + get() = SensitivityLevel.NO_SENSITIVITY + override fun onCreate(context: PreferenceLifecycleContext) { val storage = SettingsSecureStore.get(context) keyMappingObserver = diff --git a/src/com/android/settings/display/AutoBrightnessScreen.kt b/src/com/android/settings/display/AutoBrightnessScreen.kt index 385fe2072f4..32d70adabee 100644 --- a/src/com/android/settings/display/AutoBrightnessScreen.kt +++ b/src/com/android/settings/display/AutoBrightnessScreen.kt @@ -35,6 +35,7 @@ import com.android.settingslib.metadata.PreferenceAvailabilityProvider import com.android.settingslib.metadata.PreferenceMetadata import com.android.settingslib.metadata.ProvidePreferenceScreen import com.android.settingslib.metadata.ReadWritePermit +import com.android.settingslib.metadata.SensitivityLevel import com.android.settingslib.metadata.preferenceHierarchy import com.android.settingslib.preference.PreferenceScreenBinding import com.android.settingslib.preference.PreferenceScreenCreator @@ -70,6 +71,9 @@ class AutoBrightnessScreen : override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) = ReadWritePermit.ALLOW + override val sensitivityLevel + get() = SensitivityLevel.NO_SENSITIVITY + override fun isAvailable(context: Context) = context.resources.getBoolean( com.android.internal.R.bool.config_automatic_brightness_available diff --git a/src/com/android/settings/display/BatteryPercentageSwitchPreference.kt b/src/com/android/settings/display/BatteryPercentageSwitchPreference.kt index fd7b037316f..25623b37681 100644 --- a/src/com/android/settings/display/BatteryPercentageSwitchPreference.kt +++ b/src/com/android/settings/display/BatteryPercentageSwitchPreference.kt @@ -29,6 +29,7 @@ import com.android.settingslib.datastore.SettingsSystemStore import com.android.settingslib.metadata.PreferenceAvailabilityProvider import com.android.settingslib.metadata.PreferenceMetadata import com.android.settingslib.metadata.ReadWritePermit +import com.android.settingslib.metadata.SensitivityLevel import com.android.settingslib.metadata.SwitchPreference import com.android.settingslib.preference.SwitchPreferenceBinding @@ -54,6 +55,9 @@ class BatteryPercentageSwitchPreference : override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) = ReadWritePermit.ALLOW + override val sensitivityLevel + get() = SensitivityLevel.NO_SENSITIVITY + override fun bind(preference: Preference, metadata: PreferenceMetadata) { super.bind(preference, metadata) preference.onPreferenceChangeListener = this diff --git a/src/com/android/settings/display/PeakRefreshRateSwitchPreference.kt b/src/com/android/settings/display/PeakRefreshRateSwitchPreference.kt index 6dc09f6e1c3..3240616cab7 100644 --- a/src/com/android/settings/display/PeakRefreshRateSwitchPreference.kt +++ b/src/com/android/settings/display/PeakRefreshRateSwitchPreference.kt @@ -34,6 +34,7 @@ import com.android.settingslib.metadata.PreferenceLifecycleContext import com.android.settingslib.metadata.PreferenceLifecycleProvider import com.android.settingslib.metadata.PreferenceSummaryProvider import com.android.settingslib.metadata.ReadWritePermit +import com.android.settingslib.metadata.SensitivityLevel import com.android.settingslib.metadata.SwitchPreference import kotlin.math.roundToInt @@ -55,6 +56,9 @@ class PeakRefreshRateSwitchPreference : override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) = ReadWritePermit.ALLOW + override val sensitivityLevel + get() = SensitivityLevel.NO_SENSITIVITY + override fun isAvailable(context: Context) = context.resources.getBoolean(R.bool.config_show_smooth_display) && context.peakRefreshRate > DEFAULT_REFRESH_RATE diff --git a/src/com/android/settings/display/darkmode/DarkModeScreen.kt b/src/com/android/settings/display/darkmode/DarkModeScreen.kt index 91667053f69..7f8087a4928 100644 --- a/src/com/android/settings/display/darkmode/DarkModeScreen.kt +++ b/src/com/android/settings/display/darkmode/DarkModeScreen.kt @@ -37,6 +37,7 @@ import com.android.settingslib.metadata.PreferenceMetadata import com.android.settingslib.metadata.PreferenceSummaryProvider import com.android.settingslib.metadata.ProvidePreferenceScreen import com.android.settingslib.metadata.ReadWritePermit +import com.android.settingslib.metadata.SensitivityLevel import com.android.settingslib.metadata.preferenceHierarchy import com.android.settingslib.preference.PreferenceScreenBinding import com.android.settingslib.preference.PreferenceScreenCreator @@ -76,6 +77,9 @@ class DarkModeScreen : override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) = ReadWritePermit.ALLOW + override val sensitivityLevel + get() = SensitivityLevel.NO_SENSITIVITY + override fun isFlagEnabled(context: Context) = Flags.catalystDarkUiMode() override fun fragmentClass() = DarkModeSettingsFragment::class.java diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverPreference.kt b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverPreference.kt index da401c55704..84bba00bab3 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverPreference.kt +++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverPreference.kt @@ -32,6 +32,7 @@ import com.android.settingslib.metadata.MainSwitchPreference import com.android.settingslib.metadata.PreferenceLifecycleContext import com.android.settingslib.metadata.PreferenceLifecycleProvider import com.android.settingslib.metadata.ReadWritePermit +import com.android.settingslib.metadata.SensitivityLevel // LINT.IfChange class BatterySaverPreference : @@ -49,6 +50,9 @@ class BatterySaverPreference : override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) = ReadWritePermit.ALLOW + override val sensitivityLevel + get() = SensitivityLevel.NO_SENSITIVITY + override fun isEnabled(context: Context) = !BatteryStatus(BatteryUtils.getBatteryIntent(context)).isPluggedIn diff --git a/src/com/android/settings/network/AdaptiveConnectivityTogglePreference.kt b/src/com/android/settings/network/AdaptiveConnectivityTogglePreference.kt index 159ec0febef..c29ec6e7406 100644 --- a/src/com/android/settings/network/AdaptiveConnectivityTogglePreference.kt +++ b/src/com/android/settings/network/AdaptiveConnectivityTogglePreference.kt @@ -26,6 +26,7 @@ import com.android.settingslib.datastore.SettingsSecureStore import com.android.settingslib.datastore.SettingsStore import com.android.settingslib.metadata.MainSwitchPreference import com.android.settingslib.metadata.ReadWritePermit +import com.android.settingslib.metadata.SensitivityLevel // LINT.IfChange class AdaptiveConnectivityTogglePreference : @@ -40,6 +41,9 @@ class AdaptiveConnectivityTogglePreference : override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) = ReadWritePermit.ALLOW + override val sensitivityLevel + get() = SensitivityLevel.NO_SENSITIVITY + @Suppress("UNCHECKED_CAST") private class AdaptiveConnectivityToggleStorage( private val context: Context, diff --git a/src/com/android/settings/network/AirplaneModePreference.kt b/src/com/android/settings/network/AirplaneModePreference.kt index 2d9fbe9da3f..d9d1bd8061e 100644 --- a/src/com/android/settings/network/AirplaneModePreference.kt +++ b/src/com/android/settings/network/AirplaneModePreference.kt @@ -23,6 +23,7 @@ import androidx.annotation.DrawableRes import com.android.settings.R import com.android.settingslib.datastore.SettingsGlobalStore import com.android.settingslib.metadata.PreferenceAvailabilityProvider +import com.android.settingslib.metadata.SensitivityLevel import com.android.settingslib.metadata.SwitchPreference // LINT.IfChange @@ -35,6 +36,9 @@ class AirplaneModePreference : override fun storage(context: Context) = SettingsGlobalStore.get(context) + override val sensitivityLevel + get() = SensitivityLevel.HIGH_SENSITIVITY + override fun isAvailable(context: Context) = (context.resources.getBoolean(R.bool.config_show_toggle_airplane) && !context.packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)) diff --git a/src/com/android/settings/notification/CallVolumePreference.kt b/src/com/android/settings/notification/CallVolumePreference.kt index e09dc9bd426..031687f0128 100644 --- a/src/com/android/settings/notification/CallVolumePreference.kt +++ b/src/com/android/settings/notification/CallVolumePreference.kt @@ -32,6 +32,7 @@ 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 @@ -81,6 +82,9 @@ open class CallVolumePreference : override fun getWritePermit(context: Context, value: Int?, myUid: Int, callingUid: Int) = ReadWritePermit.ALLOW + override val sensitivityLevel + get() = SensitivityLevel.NO_SENSITIVITY + override fun getMinValue(context: Context) = createAudioHelper(context).getMinVolume(getAudioStream(context)) diff --git a/src/com/android/settings/notification/MediaVolumePreference.kt b/src/com/android/settings/notification/MediaVolumePreference.kt index 2533f0a6dc1..a6d9c4111d2 100644 --- a/src/com/android/settings/notification/MediaVolumePreference.kt +++ b/src/com/android/settings/notification/MediaVolumePreference.kt @@ -30,6 +30,7 @@ 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 @@ -82,6 +83,9 @@ open class MediaVolumePreference : override fun getWritePermit(context: Context, value: Int?, myUid: Int, callingUid: Int) = ReadWritePermit.ALLOW + override val sensitivityLevel + get() = SensitivityLevel.NO_SENSITIVITY + override fun getMinValue(context: Context) = createAudioHelper(context).getMinVolume(STREAM_MUSIC) diff --git a/src/com/android/settings/notification/SeparateRingVolumePreference.kt b/src/com/android/settings/notification/SeparateRingVolumePreference.kt index a9c167dbf78..3edb4ac0ed7 100644 --- a/src/com/android/settings/notification/SeparateRingVolumePreference.kt +++ b/src/com/android/settings/notification/SeparateRingVolumePreference.kt @@ -39,6 +39,7 @@ 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 @@ -91,6 +92,9 @@ open class SeparateRingVolumePreference : override fun getWritePermit(context: Context, value: Int?, myUid: Int, callingUid: Int) = ReadWritePermit.ALLOW + override val sensitivityLevel + get() = SensitivityLevel.NO_SENSITIVITY + override fun getMinValue(context: Context) = createAudioHelper(context).getMinVolume(STREAM_RING)