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

Commit 9d9dd7e3 authored by Mir Noshin Jahan's avatar Mir Noshin Jahan Committed by Android (Google) Code Review
Browse files

Merge "Use separate metric actions and tag id for wifi scorer and auto mobile... 

Merge "Use separate metric actions and tag id for wifi scorer and auto mobile network switch" into main
parents 5540cd16 492e750c

src/com/android/settings/network/AdaptiveMobileNetworkTogglePreference.kt

+4 −4
Original line number Diff line number Diff line
@@ -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)

src/com/android/settings/network/WifiScorerTogglePreference.kt

+4 −4
Original line number Diff line number Diff line
@@ -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)