PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Catalyst] Remove PreferenceMetadata usages" into main

Browse Source
This commit is contained in:
Treehugger Robot
2025-01-16 20:18:24 -08:00
committed by Android (Google) Code Review
parent fb0e99f905 297941ba2f
commit 9f654f4ec0
8 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/display/AdaptiveSleepPreference.kt
View File

@@ -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

1
src/com/android/settings/display/BrightnessLevelPreference.kt
View File

@@ -55,7 +55,6 @@ import java.text.NumberFormat
// LINT.IfChange
class BrightnessLevelPreference :
PreferenceMetadata,
PersistentPreference<Int>,
RangeValue,
PreferenceBinding,

1
src/com/android/settings/fuelgauge/BatteryHeaderPreference.kt
View File

@@ -39,7 +39,6 @@ import com.android.settingslib.widget.UsageProgressBarPreference
// LINT.IfChange
class BatteryHeaderPreference :
PersistentPreference<Int>,
PreferenceMetadata,
PreferenceBinding,
PreferenceLifecycleProvider,
RangeValue {

1
src/com/android/settings/notification/CallVolumePreference.kt
View File

@@ -43,7 +43,6 @@ import com.android.settingslib.preference.PreferenceBinding
// LINT.IfChange
open class CallVolumePreference :
PreferenceMetadata,
PreferenceBinding,
PersistentPreference<Int>,
RangeValue,

1
src/com/android/settings/notification/MediaVolumePreference.kt
View File

@@ -40,7 +40,6 @@ import com.android.settingslib.preference.PreferenceBinding
// LINT.IfChange
open class MediaVolumePreference :
PreferenceMetadata,
PreferenceBinding,
PersistentPreference<Int>,
RangeValue,

1
src/com/android/settings/notification/SeparateRingVolumePreference.kt
View File

@@ -58,7 +58,6 @@ import com.android.settingslib.preference.PreferenceBinding
// LINT.IfChange
open class SeparateRingVolumePreference :
PreferenceMetadata,
PreferenceBinding,
PersistentPreference<Int>,
RangeValue,

6
src/com/android/settings/widget/MainSwitchBarMetadata.kt
View File

@@ -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

6
src/com/android/settings/wifi/calling/WifiCallingMainSwitchPreference.kt
View File

@@ -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