Merge "Add metric and highlight key for Network screens" into main (2ba51d3c) · Commits · e / os / android_packages_apps_Settings

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

+16 −9

Original line number	Diff line number	Diff line
		@@ -16,26 +16,33 @@

		package com.android.settings.network

		import android.app.settings.SettingsEnums
		import android.content.Context
		import com.android.settings.R
		import com.android.settings.core.PreferenceScreenMixin
		import com.android.settings.flags.Flags
		import com.android.settingslib.metadata.ProvidePreferenceScreen
		import com.android.settingslib.metadata.preferenceHierarchy
		import com.android.settingslib.preference.PreferenceScreenCreator

		@ProvidePreferenceScreen(AdaptiveConnectivityScreen.KEY)
		class AdaptiveConnectivityScreen : PreferenceScreenCreator {
		open class AdaptiveConnectivityScreen : PreferenceScreenMixin {
		override val key
		get() = KEY

		override val title
		get() = R.string.adaptive_connectivity_title

		override fun getMetricsCategory() = SettingsEnums.ADAPTIVE_CONNECTIVITY_CATEGORY

		override val highlightMenuKey
		get() = R.string.menu_key_network

		override fun isFlagEnabled(context: Context) = Flags.catalystAdaptiveConnectivity()

		override fun fragmentClass() = AdaptiveConnectivitySettings::class.java

		override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(context, this) {
		override fun getPreferenceHierarchy(context: Context) =
		preferenceHierarchy(context, this) {
		+AdaptiveConnectivityTogglePreference()
		if (Flags.enableNestedToggleSwitches()) {
		+WifiScorerTogglePreference()

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

+9 −2

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		*/
		package com.android.settings.network

		import android.app.settings.SettingsEnums
		import android.content.Context
		import android.os.UserManager
		import android.telephony.SubscriptionInfo
		@@ -23,6 +24,7 @@ import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener
		import androidx.preference.Preference
		import androidx.preference.Preference.OnPreferenceClickListener
		import com.android.settings.R
		import com.android.settings.core.PreferenceScreenMixin
		import com.android.settings.flags.Flags
		import com.android.settings.network.AirplaneModePreference.Companion.isAirplaneModeOn
		import com.android.settings.network.SatelliteRepository.Companion.isSatelliteOn
		@@ -49,8 +51,8 @@ import com.android.settingslib.preference.PreferenceBinding
		import com.android.settingslib.preference.PreferenceScreenCreator

		@ProvidePreferenceScreen(MobileNetworkListScreen.KEY)
		class MobileNetworkListScreen :
		PreferenceScreenCreator,
		open class MobileNetworkListScreen :
		PreferenceScreenMixin,
		PreferenceBinding,
		PreferenceAvailabilityProvider,
		PreferenceSummaryProvider,
		@@ -76,6 +78,8 @@ class MobileNetworkListScreen :

		override fun intent(context: Context) = getAddSimIntent()

		override fun getMetricsCategory() = SettingsEnums.MOBILE_NETWORK_LIST

		override fun getSummary(context: Context): CharSequence? {
		val list = getSelectableSubscriptionInfoList(context)
		return when {
		@@ -111,6 +115,9 @@ class MobileNetworkListScreen :
		override val useAdminDisabledSummary
		get() = true

		override val highlightMenuKey
		get() = R.string.menu_key_network

		override fun createWidget(context: Context) = RestrictedPreference(context)

		override fun bind(preference: Preference, metadata: PreferenceMetadata) {

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

+9 −3

Original line number	Diff line number	Diff line
		@@ -15,9 +15,11 @@
		*/
		package com.android.settings.network

		import android.app.settings.SettingsEnums
		import android.content.Context
		import android.os.UserManager
		import com.android.settings.R
		import com.android.settings.core.PreferenceScreenMixin
		import com.android.settings.flags.Flags
		import com.android.settings.restriction.PreferenceRestrictionMixin
		import com.android.settings.wifi.WifiSwitchPreference
		@@ -25,11 +27,10 @@ import com.android.settingslib.metadata.PreferenceAvailabilityProvider
		import com.android.settingslib.metadata.PreferenceCategory
		import com.android.settingslib.metadata.ProvidePreferenceScreen
		import com.android.settingslib.metadata.preferenceHierarchy
		import com.android.settingslib.preference.PreferenceScreenCreator

		@ProvidePreferenceScreen(NetworkProviderScreen.KEY)
		class NetworkProviderScreen :
		PreferenceScreenCreator, PreferenceAvailabilityProvider, PreferenceRestrictionMixin {
		open class NetworkProviderScreen :
		PreferenceScreenMixin, PreferenceAvailabilityProvider, PreferenceRestrictionMixin {
		override val key: String
		get() = KEY

		@@ -47,9 +48,14 @@ class NetworkProviderScreen :

		override fun isEnabled(context: Context) = super<PreferenceRestrictionMixin>.isEnabled(context)

		override fun getMetricsCategory() = SettingsEnums.WIFI

		override val restrictionKeys
		get() = arrayOf(UserManager.DISALLOW_CONFIG_WIFI)

		override val highlightMenuKey
		get() = R.string.menu_key_network

		override fun isFlagEnabled(context: Context) = Flags.catalystInternetSettings()

		override fun hasCompleteHierarchy() = false

src/com/android/settings/network/tether/TetherScreen.kt

+9 −3

Original line number	Diff line number	Diff line
		@@ -15,11 +15,13 @@
		*/
		package com.android.settings.network.tether

		import android.app.settings.SettingsEnums
		import android.content.Context
		import android.net.TetheringManager
		import android.os.UserManager
		import com.android.settings.R
		import com.android.settings.Settings.TetherSettingsActivity
		import com.android.settings.core.PreferenceScreenMixin
		import com.android.settings.datausage.DataSaverMainSwitchPreference
		import com.android.settings.flags.Flags
		import com.android.settings.network.TetherPreferenceController
		@@ -33,11 +35,10 @@ import com.android.settingslib.metadata.PreferenceMetadata
		import com.android.settingslib.metadata.PreferenceTitleProvider
		import com.android.settingslib.metadata.ProvidePreferenceScreen
		import com.android.settingslib.metadata.preferenceHierarchy
		import com.android.settingslib.preference.PreferenceScreenCreator

		@ProvidePreferenceScreen(TetherScreen.KEY)
		class TetherScreen :
		PreferenceScreenCreator,
		open class TetherScreen :
		PreferenceScreenMixin,
		PreferenceTitleProvider,
		PreferenceAvailabilityProvider,
		PreferenceRestrictionMixin {
		@@ -63,9 +64,14 @@ class TetherScreen :

		override fun isEnabled(context: Context) = super<PreferenceRestrictionMixin>.isEnabled(context)

		override fun getMetricsCategory() = SettingsEnums.TETHER

		override val restrictionKeys
		get() = arrayOf(UserManager.DISALLOW_CONFIG_TETHERING)

		override val highlightMenuKey
		get() = R.string.menu_key_network

		override fun isFlagEnabled(context: Context) = Flags.catalystTetherSettings()

		override fun hasCompleteHierarchy() = false