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

Commit decd4ee9 authored by Jacky Wang's avatar Jacky Wang
Browse files

[Catalyst] Use MainSwitchPreferenceBinding explicitly 

NO_IFTTT=Catalyst only

Bug: 374860556
Flag: EXEMPT refactor
Test: atest
Change-Id: Ic1e8a824a74ca7ce421c144694474a3f8859a83c
parent 7e35e698

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

src/com/android/settings/spa/app/catalyst/AppInfoAllFilesAccessScreen.kt

+9 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import com.android.settings.utils.highlightPreference 
import com.android.settingslib.applications.ApplicationsState

import com.android.settingslib.datastore.KeyValueStore

import com.android.settingslib.datastore.NoOpKeyedObservable

import com.android.settingslib.metadata.MainSwitchPreference

import com.android.settingslib.metadata.BooleanValuePreference

import com.android.settingslib.metadata.PreferenceMetadata

import com.android.settingslib.metadata.PreferenceSummaryProvider

import com.android.settingslib.metadata.PreferenceTitleProvider
@@ -43,6 +43,7 @@ import com.android.settingslib.metadata.preferenceHierarchy 
import com.android.settingslib.preference.PreferenceFragment

import com.android.settingslib.preference.PreferenceScreenCreator

import com.android.settingslib.spaprivileged.model.app.AppListRepositoryImpl

import com.android.settingslib.widget.MainSwitchPreferenceBinding

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.flow
@@ -119,7 +120,13 @@ class AppInfoAllFilesAccessScreen(context: Context, override val arguments: Bund 
}



private class AllFilesAccessMainSwitch(private val storage: KeyValueStore) :

    MainSwitchPreference(KEY, R.string.permit_manage_external_storage) {

    BooleanValuePreference, MainSwitchPreferenceBinding {



    override val key

        get() = KEY



    override val title

        get() = R.string.permit_manage_external_storage



    override fun storage(context: Context) = storage