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

Merge "Use separate metric actions and tag id for wifi scorer and auto mobile network switch" into main

Browse Source
This commit is contained in:
Mir Noshin Jahan
2025-03-21 00:38:41 -07:00
committed by Android (Google) Code Review
parent 5540cd1606 492e750c7c
commit 9d9dd7e3f5
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/network/AdaptiveMobileNetworkTogglePreference.kt
View File

@@ -16,11 +16,11 @@
package com.android.settings.network package com.android.settings.network
import android.app.settings.SettingsEnums.ACTION_ADAPTIVE_CONNECTIVITY import android.app.settings.SettingsEnums.ACTION_ADAPTIVE_MOBILE_NETWORK
import android.content.Context import android.content.Context
import android.provider.Settings.Secure.ADAPTIVE_CONNECTIVITY_MOBILE_NETWORK_ENABLED import android.provider.Settings.Secure.ADAPTIVE_CONNECTIVITY_MOBILE_NETWORK_ENABLED
import com.android.settings.R import com.android.settings.R
import com.android.settings.contract.KEY_ADAPTIVE_CONNECTIVITY import com.android.settings.contract.KEY_ADAPTIVE_MOBILE_NETWORK
import com.android.settings.metrics.PreferenceActionMetricsProvider import com.android.settings.metrics.PreferenceActionMetricsProvider
import com.android.settingslib.datastore.KeyValueStore import com.android.settingslib.datastore.KeyValueStore
import com.android.settingslib.datastore.KeyValueStoreDelegate import com.android.settingslib.datastore.KeyValueStoreDelegate
@@ -38,12 +38,12 @@ class AdaptiveMobileNetworkTogglePreference() :
PreferenceActionMetricsProvider { PreferenceActionMetricsProvider {
override val preferenceActionMetrics: Int override val preferenceActionMetrics: Int
get() = ACTION_ADAPTIVE_CONNECTIVITY get() = ACTION_ADAPTIVE_MOBILE_NETWORK
override val key: String override val key: String
get() = KEY get() = KEY
override fun tags(context: Context) = arrayOf(KEY_ADAPTIVE_CONNECTIVITY) override fun tags(context: Context) = arrayOf(KEY_ADAPTIVE_MOBILE_NETWORK)
override fun storage(context: Context): KeyValueStore = override fun storage(context: Context): KeyValueStore =
AdaptiveMobileNetworkToggleStorage(context) AdaptiveMobileNetworkToggleStorage(context)

8
src/com/android/settings/network/WifiScorerTogglePreference.kt
View File

@@ -17,13 +17,13 @@
package com.android.settings.network package com.android.settings.network
import android.Manifest import android.Manifest
import android.app.settings.SettingsEnums.ACTION_ADAPTIVE_CONNECTIVITY import android.app.settings.SettingsEnums.ACTION_ADAPTIVE_WIFI_SCORER
import android.content.Context import android.content.Context
import android.net.wifi.WifiManager import android.net.wifi.WifiManager
import android.provider.Settings.Secure.ADAPTIVE_CONNECTIVITY_WIFI_ENABLED import android.provider.Settings.Secure.ADAPTIVE_CONNECTIVITY_WIFI_ENABLED
import androidx.annotation.RequiresPermission import androidx.annotation.RequiresPermission
import com.android.settings.R import com.android.settings.R
import com.android.settings.contract.KEY_ADAPTIVE_CONNECTIVITY import com.android.settings.contract.KEY_ADAPTIVE_WIFI_SCORER
import com.android.settings.metrics.PreferenceActionMetricsProvider import com.android.settings.metrics.PreferenceActionMetricsProvider
import com.android.settingslib.datastore.KeyValueStore import com.android.settingslib.datastore.KeyValueStore
import com.android.settingslib.datastore.KeyValueStoreDelegate import com.android.settingslib.datastore.KeyValueStoreDelegate
@@ -42,12 +42,12 @@ class WifiScorerTogglePreference() :
PreferenceActionMetricsProvider { PreferenceActionMetricsProvider {
override val preferenceActionMetrics: Int override val preferenceActionMetrics: Int
get() = ACTION_ADAPTIVE_CONNECTIVITY get() = ACTION_ADAPTIVE_WIFI_SCORER
override val key: String override val key: String
get() = KEY get() = KEY
override fun tags(context: Context) = arrayOf(KEY_ADAPTIVE_CONNECTIVITY) override fun tags(context: Context) = arrayOf(KEY_ADAPTIVE_WIFI_SCORER)
override fun storage(context: Context): KeyValueStore = override fun storage(context: Context): KeyValueStore =
WifiScorerToggleStorage(context) WifiScorerToggleStorage(context)