From 492e750c7c405660f3caace2b26f80353b94027c Mon Sep 17 00:00:00 2001 From: noshinmir Date: Wed, 19 Mar 2025 05:01:05 +0000 Subject: [PATCH] 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 --- .../network/AdaptiveMobileNetworkTogglePreference.kt | 8 ++++---- .../settings/network/WifiScorerTogglePreference.kt | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/network/AdaptiveMobileNetworkTogglePreference.kt b/src/com/android/settings/network/AdaptiveMobileNetworkTogglePreference.kt index 2b6ec916dc3..c2c2c445e80 100644 --- a/src/com/android/settings/network/AdaptiveMobileNetworkTogglePreference.kt +++ b/src/com/android/settings/network/AdaptiveMobileNetworkTogglePreference.kt @@ -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) diff --git a/src/com/android/settings/network/WifiScorerTogglePreference.kt b/src/com/android/settings/network/WifiScorerTogglePreference.kt index b94f6217dad..30e09602c17 100644 --- a/src/com/android/settings/network/WifiScorerTogglePreference.kt +++ b/src/com/android/settings/network/WifiScorerTogglePreference.kt @@ -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)