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

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

Merge changes from topic "catalyst" into main 

* changes:
  [Catalyst] Use MainSwitchPreferenceBinding explicitly
  [Catalyst] Use SliderPreferenceBinding
parents 44215796 decd4ee9

Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -99,9 +99,6 @@ android_library { 
        "Settings-change-ids",

        "SettingsLib",

        "SettingsLibActivityEmbedding",

        "SettingsLibDataStore",

        "SettingsLibMetadata",

        "SettingsLibPreference",

        "SettingsLibService",

        "aconfig_settings_flags_lib",

        "accessibility_settings_flags_lib",

src/com/android/settings/accessibility/VibrationIntensitySliderPreference.kt

+2 −7
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ import androidx.preference.Preference.OnPreferenceChangeListener 
import com.android.settingslib.datastore.KeyValueStore

import com.android.settingslib.metadata.IntRangeValuePreference

import com.android.settingslib.metadata.PreferenceMetadata

import com.android.settingslib.preference.PreferenceBinding

import com.android.settingslib.widget.SliderPreference

import com.android.settingslib.widget.SliderPreferenceBinding

import kotlin.math.min



/**
@@ -41,9 +41,7 @@ open class VibrationIntensitySliderPreference( 
    @Usage val vibrationUsage: Int,

    @StringRes override val title: Int = 0,

    @StringRes override val summary: Int = 0,

) : IntRangeValuePreference,

    OnPreferenceChangeListener,

    PreferenceBinding {

) : IntRangeValuePreference, SliderPreferenceBinding, OnPreferenceChangeListener {



    override fun getMinValue(context: Context) = Vibrator.VIBRATION_INTENSITY_OFF
@@ -55,8 +53,6 @@ open class VibrationIntensitySliderPreference( 
    override fun storage(context: Context): KeyValueStore =

        VibrationIntensitySettingsStore(context, vibrationUsage)



    override fun createWidget(context: Context) = SliderPreference(context)



    @CallSuper

    override fun bind(preference: Preference, metadata: PreferenceMetadata) {

        super.bind(preference, metadata)
@@ -65,7 +61,6 @@ open class VibrationIntensitySliderPreference( 
            // Haptics previews played by the Settings app don't bypass user settings to be played.

            // The sliders continuously updates the intensity value so the previews can apply them.

            updatesContinuously = true

            value = preferenceDataStore!!.getInt(key, 0)

        }

    }

src/com/android/settings/accessibility/VibrationMainSwitchPreference.kt

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import com.android.settingslib.metadata.BooleanValuePreference 
import com.android.settingslib.metadata.PreferenceMetadata

import com.android.settingslib.metadata.ReadWritePermit

import com.android.settingslib.metadata.SensitivityLevel

import com.android.settingslib.preference.MainSwitchPreferenceBinding

import com.android.settingslib.widget.MainSwitchPreferenceBinding



/** Accessibility settings for vibration. */

// LINT.IfChange

src/com/android/settings/fuelgauge/batterysaver/BatterySaverPreference.kt

+9 −3
Original line number Diff line number Diff line
@@ -31,10 +31,11 @@ import com.android.settingslib.fuelgauge.BatterySaverLogging.SAVER_ENABLED_SETTI 
import com.android.settingslib.fuelgauge.BatterySaverUtils

import com.android.settingslib.fuelgauge.BatteryStatus

import com.android.settingslib.fuelgauge.BatteryUtils

import com.android.settingslib.metadata.MainSwitchPreference

import com.android.settingslib.metadata.BooleanValuePreference

import com.android.settingslib.metadata.PreferenceChangeReason

import com.android.settingslib.metadata.ReadWritePermit

import com.android.settingslib.metadata.SensitivityLevel

import com.android.settingslib.widget.MainSwitchPreferenceBinding

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.Dispatchers

import kotlinx.coroutines.cancel
@@ -43,8 +44,13 @@ import kotlinx.coroutines.launch 


// LINT.IfChange

class BatterySaverPreference :

    MainSwitchPreference(KEY, R.string.battery_saver_master_switch_title),

    PreferenceActionMetricsProvider {

    BooleanValuePreference, MainSwitchPreferenceBinding, PreferenceActionMetricsProvider {



    override val key

        get() = KEY



    override val title

        get() = R.string.battery_saver_master_switch_title



    override val preferenceActionMetrics: Int

        get() = ACTION_BATTERY_SAVER

src/com/android/settings/network/AdaptiveConnectivityTogglePreference.kt

+9 −3
Original line number Diff line number Diff line
@@ -26,14 +26,20 @@ import com.android.settings.metrics.PreferenceActionMetricsProvider 
import com.android.settingslib.datastore.KeyValueStore

import com.android.settingslib.datastore.KeyValueStoreDelegate

import com.android.settingslib.datastore.SettingsSecureStore

import com.android.settingslib.metadata.MainSwitchPreference

import com.android.settingslib.metadata.BooleanValuePreference

import com.android.settingslib.metadata.ReadWritePermit

import com.android.settingslib.metadata.SensitivityLevel

import com.android.settingslib.widget.MainSwitchPreferenceBinding



// LINT.IfChange

class AdaptiveConnectivityTogglePreference :

    MainSwitchPreference(KEY, R.string.adaptive_connectivity_main_switch_title),

    PreferenceActionMetricsProvider {

    BooleanValuePreference, MainSwitchPreferenceBinding, PreferenceActionMetricsProvider {



    override val key

        get() = KEY



    override val title

        get() = R.string.adaptive_connectivity_main_switch_title



    override val preferenceActionMetrics: Int

        get() = ACTION_ADAPTIVE_CONNECTIVITY