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

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

Merge "[Catalyst] Update DataChangeReason usages to PreferenceChangeReason" into main

parents da769d75 4ca85b1e

src/com/android/settings/connecteddevice/BluetoothPreference.kt

+9 −2
Original line number Original line Diff line number Diff line
@@ -34,9 +34,9 @@ import com.android.settings.network.SatelliteWarningDialogActivity 
import com.android.settings.widget.MainSwitchBarMetadata

import com.android.settings.widget.MainSwitchBarMetadata

import com.android.settingslib.WirelessUtils

import com.android.settingslib.WirelessUtils

import com.android.settingslib.datastore.AbstractKeyedDataObservable

import com.android.settingslib.datastore.AbstractKeyedDataObservable

import com.android.settingslib.datastore.DataChangeReason

import com.android.settingslib.datastore.KeyValueStore

import com.android.settingslib.datastore.KeyValueStore

import com.android.settingslib.datastore.Permissions

import com.android.settingslib.datastore.Permissions

import com.android.settingslib.metadata.PreferenceChangeReason

import com.android.settingslib.metadata.PreferenceMetadata

import com.android.settingslib.metadata.PreferenceMetadata

import com.android.settingslib.metadata.ReadWritePermit

import com.android.settingslib.metadata.ReadWritePermit

import com.android.settingslib.metadata.SensitivityLevel

import com.android.settingslib.metadata.SensitivityLevel
@@ -152,7 +152,14 @@ class BluetoothPreference(private val bluetoothDataStore: BluetoothDataStore) : 
            broadcastReceiver =

            broadcastReceiver =

                object : BroadcastReceiver() {

                object : BroadcastReceiver() {

                    override fun onReceive(context: Context, intent: Intent) {

                    override fun onReceive(context: Context, intent: Intent) {

                        notifyChange(KEY, DataChangeReason.UPDATE)

                        val state =

                            intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.ERROR)

                        if (

                            state == BluetoothAdapter.STATE_ON ||

                                state == BluetoothAdapter.STATE_OFF

                        ) {

                            notifyChange(KEY, PreferenceChangeReason.STATE)

                        }

                    }

                    }

                }

                }

            context.registerReceiver(

            context.registerReceiver(

src/com/android/settings/datausage/DataSaverMainSwitchPreference.kt

+2 −2
Original line number Original line Diff line number Diff line
@@ -21,9 +21,9 @@ import android.content.Context 
import com.android.settings.R

import com.android.settings.R

import com.android.settings.widget.MainSwitchBarMetadata

import com.android.settings.widget.MainSwitchBarMetadata

import com.android.settingslib.datastore.AbstractKeyedDataObservable

import com.android.settingslib.datastore.AbstractKeyedDataObservable

import com.android.settingslib.datastore.DataChangeReason

import com.android.settingslib.datastore.KeyValueStore

import com.android.settingslib.datastore.KeyValueStore

import com.android.settingslib.datastore.Permissions

import com.android.settingslib.datastore.Permissions

import com.android.settingslib.metadata.PreferenceChangeReason

import com.android.settingslib.metadata.PreferenceLifecycleProvider

import com.android.settingslib.metadata.PreferenceLifecycleProvider

import com.android.settingslib.metadata.ReadWritePermit

import com.android.settingslib.metadata.ReadWritePermit

import com.android.settingslib.metadata.SensitivityLevel

import com.android.settingslib.metadata.SensitivityLevel
@@ -75,7 +75,7 @@ class DataSaverMainSwitchPreference : MainSwitchBarMetadata, PreferenceLifecycle 
        override fun onLastObserverRemoved() = dataSaverBackend.remListener(this)

        override fun onLastObserverRemoved() = dataSaverBackend.remListener(this)





        override fun onDataSaverChanged(isDataSaving: Boolean) =

        override fun onDataSaverChanged(isDataSaving: Boolean) =

            notifyChange(KEY, DataChangeReason.UPDATE)

            notifyChange(KEY, PreferenceChangeReason.VALUE)

    }

    }





    companion object {

    companion object {

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -33,7 +33,6 @@ import com.android.settings.Utils 
import com.android.settings.core.SettingsBaseActivity

import com.android.settings.core.SettingsBaseActivity

import com.android.settingslib.RestrictedPreference

import com.android.settingslib.RestrictedPreference

import com.android.settingslib.datastore.AbstractKeyedDataObservable

import com.android.settingslib.datastore.AbstractKeyedDataObservable

import com.android.settingslib.datastore.DataChangeReason

import com.android.settingslib.datastore.HandlerExecutor

import com.android.settingslib.datastore.HandlerExecutor

import com.android.settingslib.datastore.KeyValueStore

import com.android.settingslib.datastore.KeyValueStore

import com.android.settingslib.datastore.KeyedObserver

import com.android.settingslib.datastore.KeyedObserver
@@ -43,6 +42,7 @@ import com.android.settingslib.display.BrightnessUtils.GAMMA_SPACE_MAX 
import com.android.settingslib.display.BrightnessUtils.GAMMA_SPACE_MIN

import com.android.settingslib.display.BrightnessUtils.GAMMA_SPACE_MIN

import com.android.settingslib.display.BrightnessUtils.convertLinearToGammaFloat

import com.android.settingslib.display.BrightnessUtils.convertLinearToGammaFloat

import com.android.settingslib.metadata.PersistentPreference

import com.android.settingslib.metadata.PersistentPreference

import com.android.settingslib.metadata.PreferenceChangeReason

import com.android.settingslib.metadata.PreferenceMetadata

import com.android.settingslib.metadata.PreferenceMetadata

import com.android.settingslib.metadata.PreferenceSummaryProvider

import com.android.settingslib.metadata.PreferenceSummaryProvider

import com.android.settingslib.metadata.RangeValue

import com.android.settingslib.metadata.RangeValue
@@ -155,7 +155,7 @@ class BrightnessLevelPreference : 
        }

        }





        override fun onKeyChanged(key: String, reason: Int) {

        override fun onKeyChanged(key: String, reason: Int) {

            notifyChange(KEY, DataChangeReason.UPDATE)

            notifyChange(KEY, reason)

        }

        }





        override fun onDisplayAdded(displayId: Int) {}

        override fun onDisplayAdded(displayId: Int) {}
@@ -163,7 +163,7 @@ class BrightnessLevelPreference : 
        override fun onDisplayRemoved(displayId: Int) {}

        override fun onDisplayRemoved(displayId: Int) {}





        override fun onDisplayChanged(displayId: Int) {

        override fun onDisplayChanged(displayId: Int) {

            notifyChange(KEY, DataChangeReason.UPDATE)

            notifyChange(KEY, PreferenceChangeReason.STATE)

        }

        }

    }

    }

src/com/android/settings/display/darkmode/DarkModeStorage.kt

+3 −3
Original line number Original line Diff line number Diff line
@@ -24,8 +24,8 @@ import android.content.IntentFilter 
import android.content.res.Configuration

import android.content.res.Configuration

import android.os.PowerManager

import android.os.PowerManager

import com.android.settingslib.datastore.AbstractKeyedDataObservable

import com.android.settingslib.datastore.AbstractKeyedDataObservable

import com.android.settingslib.datastore.DataChangeReason

import com.android.settingslib.datastore.KeyValueStore

import com.android.settingslib.datastore.KeyValueStore

import com.android.settingslib.metadata.PreferenceChangeReason





/**

/**

 * Abstract storage for dark mode settings.

 * Abstract storage for dark mode settings.
@@ -54,7 +54,7 @@ internal class DarkModeStorage(private val context: Context) : 
        broadcastReceiver =

        broadcastReceiver =

            object : BroadcastReceiver() {

            object : BroadcastReceiver() {

                override fun onReceive(context: Context, intent: Intent) {

                override fun onReceive(context: Context, intent: Intent) {

                    notifyChange(DataChangeReason.UPDATE)

                    notifyChange(PreferenceChangeReason.STATE)

                }

                }

            }

            }

        context.registerReceiver(

        context.registerReceiver(
@@ -63,7 +63,7 @@ internal class DarkModeStorage(private val context: Context) : 
        )

        )





        darkModeObserver = DarkModeObserver(context)

        darkModeObserver = DarkModeObserver(context)

        darkModeObserver.subscribe { notifyChange(DataChangeReason.UPDATE) }

        darkModeObserver.subscribe { notifyChange(PreferenceChangeReason.VALUE) }

    }

    }





    override fun onLastObserverRemoved() {

    override fun onLastObserverRemoved() {

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -22,7 +22,6 @@ import com.android.settings.R 
import com.android.settings.fuelgauge.BatterySaverReceiver

import com.android.settings.fuelgauge.BatterySaverReceiver

import com.android.settings.fuelgauge.BatterySaverReceiver.BatterySaverListener

import com.android.settings.fuelgauge.BatterySaverReceiver.BatterySaverListener

import com.android.settingslib.datastore.AbstractKeyedDataObservable

import com.android.settingslib.datastore.AbstractKeyedDataObservable

import com.android.settingslib.datastore.DataChangeReason

import com.android.settingslib.datastore.KeyValueStore

import com.android.settingslib.datastore.KeyValueStore

import com.android.settingslib.datastore.Permissions

import com.android.settingslib.datastore.Permissions

import com.android.settingslib.fuelgauge.BatterySaverLogging.SAVER_ENABLED_SETTINGS

import com.android.settingslib.fuelgauge.BatterySaverLogging.SAVER_ENABLED_SETTINGS
@@ -30,6 +29,7 @@ import com.android.settingslib.fuelgauge.BatterySaverUtils 
import com.android.settingslib.fuelgauge.BatteryStatus

import com.android.settingslib.fuelgauge.BatteryStatus

import com.android.settingslib.fuelgauge.BatteryUtils

import com.android.settingslib.fuelgauge.BatteryUtils

import com.android.settingslib.metadata.MainSwitchPreference

import com.android.settingslib.metadata.MainSwitchPreference

import com.android.settingslib.metadata.PreferenceChangeReason

import com.android.settingslib.metadata.ReadWritePermit

import com.android.settingslib.metadata.ReadWritePermit

import com.android.settingslib.metadata.SensitivityLevel

import com.android.settingslib.metadata.SensitivityLevel

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.CoroutineScope
@@ -105,12 +105,12 @@ class BatterySaverPreference : 
        override fun onPowerSaveModeChanged() {

        override fun onPowerSaveModeChanged() {

            scope.launch {

            scope.launch {

                delay(SWITCH_ANIMATION_DURATION)

                delay(SWITCH_ANIMATION_DURATION)

                notifyChange(KEY, DataChangeReason.UPDATE)

                notifyChange(KEY, PreferenceChangeReason.VALUE)

            }

            }

        }

        }





        override fun onBatteryChanged(pluggedIn: Boolean) =

        override fun onBatteryChanged(pluggedIn: Boolean) =

            notifyChange(KEY, DataChangeReason.UPDATE)

            notifyChange(KEY, PreferenceChangeReason.STATE)

    }

    }





    companion object {

    companion object {