[Catalyst] Move PreferenceRestrictionMixin
NO_IFTTT=Catalyst only Bug: 377600992 Flag: EXEMPT refactor Test: atest Change-Id: I3c26a5a56d8fd6e887e4ff4d38d8e8eb97844672
This commit is contained in:
@@ -30,12 +30,12 @@ import android.telephony.TelephonyManager
|
||||
import androidx.annotation.DrawableRes
|
||||
import androidx.preference.Preference
|
||||
import com.android.settings.AirplaneModeEnabler
|
||||
import com.android.settings.PreferenceRestrictionMixin
|
||||
import com.android.settings.R
|
||||
import com.android.settings.Utils
|
||||
import com.android.settings.contract.KEY_AIRPLANE_MODE
|
||||
import com.android.settings.metrics.PreferenceActionMetricsProvider
|
||||
import com.android.settings.network.SatelliteRepository.Companion.isSatelliteOn
|
||||
import com.android.settings.restriction.PreferenceRestrictionMixin
|
||||
import com.android.settingslib.RestrictedSwitchPreference
|
||||
import com.android.settingslib.datastore.AbstractKeyedDataObservable
|
||||
import com.android.settingslib.datastore.KeyValueStore
|
||||
|
@@ -22,7 +22,6 @@ import android.telephony.SubscriptionManager
|
||||
import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener
|
||||
import androidx.preference.Preference
|
||||
import androidx.preference.Preference.OnPreferenceClickListener
|
||||
import com.android.settings.PreferenceRestrictionMixin
|
||||
import com.android.settings.R
|
||||
import com.android.settings.flags.Flags
|
||||
import com.android.settings.network.AirplaneModePreference.Companion.isAirplaneModeOn
|
||||
@@ -30,6 +29,7 @@ import com.android.settings.network.SubscriptionUtil.getUniqueSubscriptionDispla
|
||||
import com.android.settings.network.telephony.SimRepository
|
||||
import com.android.settings.network.telephony.SubscriptionRepository
|
||||
import com.android.settings.network.telephony.euicc.EuiccRepository
|
||||
import com.android.settings.restriction.PreferenceRestrictionMixin
|
||||
import com.android.settings.spa.network.getAddSimIntent
|
||||
import com.android.settings.spa.network.startAddSimFlow
|
||||
import com.android.settingslib.RestrictedPreference
|
||||
|
@@ -17,9 +17,9 @@ package com.android.settings.network
|
||||
|
||||
import android.content.Context
|
||||
import android.os.UserManager
|
||||
import com.android.settings.PreferenceRestrictionMixin
|
||||
import com.android.settings.R
|
||||
import com.android.settings.flags.Flags
|
||||
import com.android.settings.restriction.PreferenceRestrictionMixin
|
||||
import com.android.settings.wifi.WifiSwitchPreference
|
||||
import com.android.settingslib.metadata.PreferenceAvailabilityProvider
|
||||
import com.android.settingslib.metadata.ProvidePreferenceScreen
|
||||
@@ -55,9 +55,8 @@ class NetworkProviderScreen :
|
||||
|
||||
override fun fragmentClass() = NetworkProviderSettings::class.java
|
||||
|
||||
override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(context, this) {
|
||||
+WifiSwitchPreference()
|
||||
}
|
||||
override fun getPreferenceHierarchy(context: Context) =
|
||||
preferenceHierarchy(context, this) { +WifiSwitchPreference() }
|
||||
|
||||
companion object {
|
||||
const val KEY = "internet_settings"
|
||||
|
@@ -18,12 +18,12 @@ package com.android.settings.network.tether
|
||||
import android.content.Context
|
||||
import android.net.TetheringManager
|
||||
import android.os.UserManager
|
||||
import com.android.settings.PreferenceRestrictionMixin
|
||||
import com.android.settings.R
|
||||
import com.android.settings.Settings.TetherSettingsActivity
|
||||
import com.android.settings.datausage.DataSaverMainSwitchPreference
|
||||
import com.android.settings.flags.Flags
|
||||
import com.android.settings.network.TetherPreferenceController
|
||||
import com.android.settings.restriction.PreferenceRestrictionMixin
|
||||
import com.android.settings.utils.makeLaunchIntent
|
||||
import com.android.settings.wifi.tether.WifiHotspotSwitchPreference
|
||||
import com.android.settingslib.TetherUtil
|
||||
|
Reference in New Issue
Block a user