Merge "[Catalyst] Implement metrics/tags for "Wi-Fi"" into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
a477817f06
@@ -17,6 +17,7 @@
|
|||||||
package com.android.settings.wifi
|
package com.android.settings.wifi
|
||||||
|
|
||||||
import android.Manifest
|
import android.Manifest
|
||||||
|
import android.app.settings.SettingsEnums.ACTION_WIFI
|
||||||
import android.app.settings.SettingsEnums.ACTION_WIFI_OFF
|
import android.app.settings.SettingsEnums.ACTION_WIFI_OFF
|
||||||
import android.app.settings.SettingsEnums.ACTION_WIFI_ON
|
import android.app.settings.SettingsEnums.ACTION_WIFI_ON
|
||||||
import android.content.BroadcastReceiver
|
import android.content.BroadcastReceiver
|
||||||
@@ -29,8 +30,10 @@ import android.provider.Settings
|
|||||||
import android.widget.Toast
|
import android.widget.Toast
|
||||||
import androidx.preference.Preference
|
import androidx.preference.Preference
|
||||||
import androidx.preference.Preference.OnPreferenceChangeListener
|
import androidx.preference.Preference.OnPreferenceChangeListener
|
||||||
|
import com.android.settings.PreferenceActionMetricsProvider
|
||||||
import com.android.settings.PreferenceRestrictionMixin
|
import com.android.settings.PreferenceRestrictionMixin
|
||||||
import com.android.settings.R
|
import com.android.settings.R
|
||||||
|
import com.android.settings.contract.KEY_WIFI
|
||||||
import com.android.settings.network.SatelliteRepository.Companion.isSatelliteOn
|
import com.android.settings.network.SatelliteRepository.Companion.isSatelliteOn
|
||||||
import com.android.settings.network.SatelliteWarningDialogActivity
|
import com.android.settings.network.SatelliteWarningDialogActivity
|
||||||
import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
|
import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
|
||||||
@@ -54,6 +57,7 @@ import com.android.settingslib.preference.SwitchPreferenceBinding
|
|||||||
class WifiSwitchPreference :
|
class WifiSwitchPreference :
|
||||||
SwitchPreference(KEY, R.string.wifi),
|
SwitchPreference(KEY, R.string.wifi),
|
||||||
SwitchPreferenceBinding,
|
SwitchPreferenceBinding,
|
||||||
|
PreferenceActionMetricsProvider,
|
||||||
OnPreferenceChangeListener,
|
OnPreferenceChangeListener,
|
||||||
PreferenceLifecycleProvider,
|
PreferenceLifecycleProvider,
|
||||||
PreferenceRestrictionMixin {
|
PreferenceRestrictionMixin {
|
||||||
@@ -61,6 +65,11 @@ class WifiSwitchPreference :
|
|||||||
override val keywords: Int
|
override val keywords: Int
|
||||||
get() = R.string.keywords_wifi
|
get() = R.string.keywords_wifi
|
||||||
|
|
||||||
|
override val preferenceActionMetrics: Int
|
||||||
|
get() = ACTION_WIFI
|
||||||
|
|
||||||
|
override fun tags(context: Context) = arrayOf(KEY_WIFI)
|
||||||
|
|
||||||
override fun isEnabled(context: Context) = super<PreferenceRestrictionMixin>.isEnabled(context)
|
override fun isEnabled(context: Context) = super<PreferenceRestrictionMixin>.isEnabled(context)
|
||||||
|
|
||||||
override val restrictionKeys
|
override val restrictionKeys
|
||||||
|
Reference in New Issue
Block a user