diff --git a/src/com/android/settings/display/AdaptiveSleepPreference.kt b/src/com/android/settings/display/AdaptiveSleepPreference.kt
index 0fe2a098734..45b05ec3471 100644
--- a/src/com/android/settings/display/AdaptiveSleepPreference.kt
+++ b/src/com/android/settings/display/AdaptiveSleepPreference.kt
@@ -33,18 +33,18 @@ import com.android.settingslib.datastore.KeyValueStore
 import com.android.settingslib.datastore.KeyedObservableDelegate
 import com.android.settingslib.datastore.SettingsSecureStore
 import com.android.settingslib.datastore.SettingsStore
+import com.android.settingslib.metadata.BooleanValuePreference
 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
 
 // LINT.IfChange
 class AdaptiveSleepPreference :
-    TwoStatePreference,
+    BooleanValuePreference,
     SwitchPreferenceBinding,
     PreferenceLifecycleProvider,
     PreferenceBindingPlaceholder, // not needed once controller class is cleaned up
diff --git a/src/com/android/settings/display/BrightnessLevelPreference.kt b/src/com/android/settings/display/BrightnessLevelPreference.kt
index e14db6b59a6..0465d22361e 100644
--- a/src/com/android/settings/display/BrightnessLevelPreference.kt
+++ b/src/com/android/settings/display/BrightnessLevelPreference.kt
@@ -55,7 +55,6 @@ import java.text.NumberFormat
 
 // LINT.IfChange
 class BrightnessLevelPreference :
-    PreferenceMetadata,
     PersistentPreference<Int>,
     RangeValue,
     PreferenceBinding,
diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreference.kt b/src/com/android/settings/fuelgauge/BatteryHeaderPreference.kt
index f0a3ae67af9..36654691c36 100644
--- a/src/com/android/settings/fuelgauge/BatteryHeaderPreference.kt
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreference.kt
@@ -39,7 +39,6 @@ import com.android.settingslib.widget.UsageProgressBarPreference
 // LINT.IfChange
 class BatteryHeaderPreference :
     PersistentPreference<Int>,
-    PreferenceMetadata,
     PreferenceBinding,
     PreferenceLifecycleProvider,
     RangeValue {
diff --git a/src/com/android/settings/notification/CallVolumePreference.kt b/src/com/android/settings/notification/CallVolumePreference.kt
index 3caac242316..cc6f45fe270 100644
--- a/src/com/android/settings/notification/CallVolumePreference.kt
+++ b/src/com/android/settings/notification/CallVolumePreference.kt
@@ -43,7 +43,6 @@ import com.android.settingslib.preference.PreferenceBinding
 
 // LINT.IfChange
 open class CallVolumePreference :
-    PreferenceMetadata,
     PreferenceBinding,
     PersistentPreference<Int>,
     RangeValue,
diff --git a/src/com/android/settings/notification/MediaVolumePreference.kt b/src/com/android/settings/notification/MediaVolumePreference.kt
index 02bf82479c0..71f2f91276f 100644
--- a/src/com/android/settings/notification/MediaVolumePreference.kt
+++ b/src/com/android/settings/notification/MediaVolumePreference.kt
@@ -40,7 +40,6 @@ import com.android.settingslib.preference.PreferenceBinding
 
 // LINT.IfChange
 open class MediaVolumePreference :
-    PreferenceMetadata,
     PreferenceBinding,
     PersistentPreference<Int>,
     RangeValue,
diff --git a/src/com/android/settings/notification/SeparateRingVolumePreference.kt b/src/com/android/settings/notification/SeparateRingVolumePreference.kt
index 4cdac1434bf..7bc39a82d10 100644
--- a/src/com/android/settings/notification/SeparateRingVolumePreference.kt
+++ b/src/com/android/settings/notification/SeparateRingVolumePreference.kt
@@ -58,7 +58,6 @@ import com.android.settingslib.preference.PreferenceBinding
 
 // LINT.IfChange
 open class SeparateRingVolumePreference :
-    PreferenceMetadata,
     PreferenceBinding,
     PersistentPreference<Int>,
     RangeValue,
diff --git a/src/com/android/settings/widget/MainSwitchBarMetadata.kt b/src/com/android/settings/widget/MainSwitchBarMetadata.kt
index 4fc89bc19b6..0f07bba3eaa 100644
--- a/src/com/android/settings/widget/MainSwitchBarMetadata.kt
+++ b/src/com/android/settings/widget/MainSwitchBarMetadata.kt
@@ -18,14 +18,14 @@ package com.android.settings.widget
 
 import android.content.Context
 import androidx.preference.Preference
+import com.android.settingslib.metadata.BooleanValuePreference
 import com.android.settingslib.metadata.PreferenceMetadata
-import com.android.settingslib.metadata.TwoStatePreference
 import com.android.settingslib.preference.PreferenceBindingPlaceholder
-import com.android.settingslib.preference.TwoStatePreferenceBinding
+import com.android.settingslib.preference.BooleanValuePreferenceBinding
 
 /** Base metadata of `MainSwitchBar`. */
 interface MainSwitchBarMetadata :
-    TwoStatePreference, TwoStatePreferenceBinding, PreferenceBindingPlaceholder {
+    BooleanValuePreference, BooleanValuePreferenceBinding, PreferenceBindingPlaceholder {
 
     /**
      * Disable main switch bar when user toggles the switch. By this way, user cannot toggle again
diff --git a/src/com/android/settings/wifi/calling/WifiCallingMainSwitchPreference.kt b/src/com/android/settings/wifi/calling/WifiCallingMainSwitchPreference.kt
index dc6737310d3..8765547a957 100644
--- a/src/com/android/settings/wifi/calling/WifiCallingMainSwitchPreference.kt
+++ b/src/com/android/settings/wifi/calling/WifiCallingMainSwitchPreference.kt
@@ -33,11 +33,11 @@ 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.BooleanValuePreference
 import com.android.settingslib.metadata.PreferenceAvailabilityProvider
 import com.android.settingslib.metadata.ReadWritePermit
 import com.android.settingslib.metadata.SensitivityLevel
-import com.android.settingslib.metadata.TwoStatePreference
-import com.android.settingslib.preference.TwoStatePreferenceBinding
+import com.android.settingslib.preference.BooleanValuePreferenceBinding
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.runBlocking
 
@@ -47,7 +47,7 @@ import kotlinx.coroutines.runBlocking
  * TODO(b/372732219): apply metadata to UI
  */
 class WifiCallingMainSwitchPreference(private val subId: Int) :
-    TwoStatePreference, TwoStatePreferenceBinding, PreferenceAvailabilityProvider {
+    BooleanValuePreference, BooleanValuePreferenceBinding, PreferenceAvailabilityProvider {
 
     override val key: String
         get() = KEY