diff --git a/src/com/android/settings/display/AutoBrightnessScreen.kt b/src/com/android/settings/display/AutoBrightnessScreen.kt index 2e8c7088ae9..0e682ff92df 100644 --- a/src/com/android/settings/display/AutoBrightnessScreen.kt +++ b/src/com/android/settings/display/AutoBrightnessScreen.kt @@ -37,6 +37,7 @@ import com.android.settingslib.metadata.PreferenceAvailabilityProvider import com.android.settingslib.metadata.PreferenceMetadata import com.android.settingslib.metadata.PreferenceRestrictionProvider import com.android.settingslib.metadata.ProvidePreferenceScreen +import com.android.settingslib.metadata.ReadWritePermit import com.android.settingslib.metadata.preferenceHierarchy import com.android.settingslib.preference.PreferenceScreenBinding import com.android.settingslib.preference.PreferenceScreenCreator @@ -66,6 +67,9 @@ class AutoBrightnessScreen : override fun storage(context: Context): KeyValueStore = AutoBrightnessDataStore(SettingsSystemStore.get(context)) + override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) = + ReadWritePermit.ALLOW + 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/PeakRefreshRateSwitchPreference.kt b/src/com/android/settings/display/PeakRefreshRateSwitchPreference.kt index 5302fce5451..e60a4c71ce0 100644 --- a/src/com/android/settings/display/PeakRefreshRateSwitchPreference.kt +++ b/src/com/android/settings/display/PeakRefreshRateSwitchPreference.kt @@ -33,6 +33,7 @@ import com.android.settingslib.metadata.PreferenceAvailabilityProvider 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.SwitchPreference import kotlin.math.roundToInt @@ -48,6 +49,9 @@ class PeakRefreshRateSwitchPreference : override fun storage(context: Context): KeyValueStore = PeakRefreshRateStore(context, SettingsSystemStore.get(context)) + override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) = + ReadWritePermit.ALLOW + 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 263958cd335..1124b3abcb2 100644 --- a/src/com/android/settings/display/darkmode/DarkModeScreen.kt +++ b/src/com/android/settings/display/darkmode/DarkModeScreen.kt @@ -36,6 +36,7 @@ import com.android.settingslib.metadata.PreferenceLifecycleProvider 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.preferenceHierarchy import com.android.settingslib.preference.PreferenceScreenBinding import com.android.settingslib.preference.PreferenceScreenCreator @@ -69,6 +70,9 @@ class DarkModeScreen : override val keywords: Int get() = R.string.keywords_dark_ui_mode + override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) = + ReadWritePermit.ALLOW + override fun isFlagEnabled(context: Context) = Flags.catalystDarkUiMode() override fun fragmentClass() = DarkModeSettingsFragment::class.java diff --git a/src/com/android/settings/notification/CallVolumePreference.kt b/src/com/android/settings/notification/CallVolumePreference.kt index 0126e139d44..3c14ae4fafb 100644 --- a/src/com/android/settings/notification/CallVolumePreference.kt +++ b/src/com/android/settings/notification/CallVolumePreference.kt @@ -33,6 +33,7 @@ import com.android.settingslib.metadata.PreferenceIconProvider import com.android.settingslib.metadata.PreferenceMetadata import com.android.settingslib.metadata.PreferenceRestrictionProvider import com.android.settingslib.metadata.RangeValue +import com.android.settingslib.metadata.ReadWritePermit import com.android.settingslib.preference.PreferenceBinding // LINT.IfChange @@ -82,6 +83,9 @@ open class CallVolumePreference : } } + override fun getWritePermit(context: Context, value: Int?, myUid: Int, callingUid: Int) = + ReadWritePermit.ALLOW + 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 13fd0297540..acb8f8d3af1 100644 --- a/src/com/android/settings/notification/MediaVolumePreference.kt +++ b/src/com/android/settings/notification/MediaVolumePreference.kt @@ -25,7 +25,13 @@ import com.android.settings.R import com.android.settingslib.RestrictedLockUtilsInternal import com.android.settingslib.datastore.KeyValueStore import com.android.settingslib.datastore.NoOpKeyedObservable -import com.android.settingslib.metadata.* +import com.android.settingslib.metadata.PersistentPreference +import com.android.settingslib.metadata.PreferenceAvailabilityProvider +import com.android.settingslib.metadata.PreferenceIconProvider +import com.android.settingslib.metadata.PreferenceMetadata +import com.android.settingslib.metadata.PreferenceRestrictionProvider +import com.android.settingslib.metadata.RangeValue +import com.android.settingslib.metadata.ReadWritePermit import com.android.settingslib.preference.PreferenceBinding // LINT.IfChange @@ -79,6 +85,9 @@ open class MediaVolumePreference : } } + override fun getWritePermit(context: Context, value: Int?, myUid: Int, callingUid: Int) = + ReadWritePermit.ALLOW + 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 2f696b1c0f9..6831daad683 100644 --- a/src/com/android/settings/notification/SeparateRingVolumePreference.kt +++ b/src/com/android/settings/notification/SeparateRingVolumePreference.kt @@ -40,6 +40,7 @@ import com.android.settingslib.metadata.PreferenceIconProvider import com.android.settingslib.metadata.PreferenceMetadata import com.android.settingslib.metadata.PreferenceRestrictionProvider import com.android.settingslib.metadata.RangeValue +import com.android.settingslib.metadata.ReadWritePermit import com.android.settingslib.preference.PreferenceBinding // LINT.IfChange @@ -94,6 +95,9 @@ open class SeparateRingVolumePreference : } } + override fun getWritePermit(context: Context, value: Int?, myUid: Int, callingUid: Int) = + ReadWritePermit.ALLOW + override fun getMinValue(context: Context) = createAudioHelper(context).getMinVolume(STREAM_RING)