Merge "[Catalyst] Remove BooleanValue usages" into main

This commit is contained in:
Treehugger Robot
2025-01-15 01:29:17 -08:00
committed by Android (Google) Code Review
2 changed files with 4 additions and 8 deletions

View File

@@ -29,8 +29,7 @@ import com.android.settingslib.datastore.KeyValueStore
import com.android.settingslib.datastore.KeyedObservableDelegate
import com.android.settingslib.datastore.SettingsStore
import com.android.settingslib.datastore.SettingsSystemStore
import com.android.settingslib.metadata.BooleanValue
import com.android.settingslib.metadata.PersistentPreference
import com.android.settingslib.metadata.BooleanPreference
import com.android.settingslib.metadata.PreferenceAvailabilityProvider
import com.android.settingslib.metadata.PreferenceMetadata
import com.android.settingslib.metadata.ProvidePreferenceScreen
@@ -46,8 +45,7 @@ class AutoBrightnessScreen :
PreferenceScreenBinding,
PreferenceAvailabilityProvider,
PreferenceRestrictionMixin,
PersistentPreference<Boolean>,
BooleanValue {
BooleanPreference {
override val key: String
get() = KEY

View File

@@ -25,8 +25,7 @@ import com.android.settings.flags.Flags
import com.android.settingslib.PrimarySwitchPreference
import com.android.settingslib.datastore.KeyValueStore
import com.android.settingslib.datastore.Permissions
import com.android.settingslib.metadata.BooleanValue
import com.android.settingslib.metadata.PersistentPreference
import com.android.settingslib.metadata.BooleanPreference
import com.android.settingslib.metadata.PreferenceMetadata
import com.android.settingslib.metadata.PreferenceSummaryProvider
import com.android.settingslib.metadata.ProvidePreferenceScreen
@@ -41,8 +40,7 @@ import com.android.settingslib.preference.PreferenceScreenCreator
class DarkModeScreen(context: Context) :
PreferenceScreenCreator,
PreferenceScreenBinding,
PersistentPreference<Boolean>,
BooleanValue,
BooleanPreference,
PreferenceSummaryProvider {
private val darkModeStorage = DarkModeStorage(context)