Use separate metric actions and tag id for wifi scorer and auto mobile network switch

Bug: 393645580
Flag: com.android.settings.flags.enable_nested_toggle_switches
Test: Build pass, presubmit

Change-Id: I65625603449b4a3b599ce6acf944c6467b0efcec
This commit is contained in:
noshinmir
2025-03-19 05:01:05 +00:00
committed by Mir Noshin Jahan
parent 1f8cd5ecc2
commit 492e750c7c
2 changed files with 8 additions and 8 deletions

View File

@@ -16,11 +16,11 @@
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.provider.Settings.Secure.ADAPTIVE_CONNECTIVITY_MOBILE_NETWORK_ENABLED
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.settingslib.datastore.KeyValueStore
import com.android.settingslib.datastore.KeyValueStoreDelegate
@@ -38,12 +38,12 @@ class AdaptiveMobileNetworkTogglePreference() :
PreferenceActionMetricsProvider {
override val preferenceActionMetrics: Int
get() = ACTION_ADAPTIVE_CONNECTIVITY
get() = ACTION_ADAPTIVE_MOBILE_NETWORK
override val key: String
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 =
AdaptiveMobileNetworkToggleStorage(context)

View File

@@ -17,13 +17,13 @@
package com.android.settings.network
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.net.wifi.WifiManager
import android.provider.Settings.Secure.ADAPTIVE_CONNECTIVITY_WIFI_ENABLED
import androidx.annotation.RequiresPermission
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.settingslib.datastore.KeyValueStore
import com.android.settingslib.datastore.KeyValueStoreDelegate
@@ -42,12 +42,12 @@ class WifiScorerTogglePreference() :
PreferenceActionMetricsProvider {
override val preferenceActionMetrics: Int
get() = ACTION_ADAPTIVE_CONNECTIVITY
get() = ACTION_ADAPTIVE_WIFI_SCORER
override val key: String
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 =
WifiScorerToggleStorage(context)