Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f654f4e authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Catalyst] Remove PreferenceMetadata usages" into main

parents fb0e99f9 297941ba

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

+2 −2
Original line number Diff line number Diff line
@@ -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

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

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ import java.text.NumberFormat 


// LINT.IfChange

class BrightnessLevelPreference :

    PreferenceMetadata,

    PersistentPreference<Int>,

    RangeValue,

    PreferenceBinding,

src/com/android/settings/fuelgauge/BatteryHeaderPreference.kt

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import com.android.settingslib.widget.UsageProgressBarPreference 
// LINT.IfChange

class BatteryHeaderPreference :

    PersistentPreference<Int>,

    PreferenceMetadata,

    PreferenceBinding,

    PreferenceLifecycleProvider,

    RangeValue {

src/com/android/settings/notification/CallVolumePreference.kt

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import com.android.settingslib.preference.PreferenceBinding 


// LINT.IfChange

open class CallVolumePreference :

    PreferenceMetadata,

    PreferenceBinding,

    PersistentPreference<Int>,

    RangeValue,

src/com/android/settings/notification/MediaVolumePreference.kt

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ import com.android.settingslib.preference.PreferenceBinding 


// LINT.IfChange

open class MediaVolumePreference :

    PreferenceMetadata,

    PreferenceBinding,

    PersistentPreference<Int>,

    RangeValue,