PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Catalyst] Move PreferenceRestrictionMixin

Browse Source 
NO_IFTTT=Catalyst only

Bug: 377600992
Flag: EXEMPT refactor
Test: atest
Change-Id: I3c26a5a56d8fd6e887e4ff4d38d8e8eb97844672
This commit is contained in:
Jacky Wang
2025-02-11 20:15:27 +08:00
parent afbcf06654
commit a2e663dadd
17 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/SettingsPreferenceBindingFactory.kt
View File

@@ -17,6 +17,9 @@
package com.android.settings package com.android.settings
import androidx.preference.Preference import androidx.preference.Preference
import com.android.settings.restriction.PreferenceRestrictionMixin
import com.android.settings.restriction.getRestrictionEnforcedAdmin
import com.android.settings.restriction.hasBaseUserRestriction
import com.android.settingslib.RestrictedPreferenceHelperProvider import com.android.settingslib.RestrictedPreferenceHelperProvider
import com.android.settingslib.metadata.PreferenceHierarchyNode import com.android.settingslib.metadata.PreferenceHierarchyNode
import com.android.settingslib.preference.DefaultPreferenceBindingFactory import com.android.settingslib.preference.DefaultPreferenceBindingFactory

2
src/com/android/settings/connecteddevice/BluetoothPreference.kt
View File

@@ -28,12 +28,12 @@ import android.os.UserManager
import android.provider.Settings import android.provider.Settings
import android.widget.Toast import android.widget.Toast
import androidx.preference.Preference import androidx.preference.Preference
import com.android.settings.PreferenceRestrictionMixin
import com.android.settings.R import com.android.settings.R
import com.android.settings.contract.KEY_BLUETOOTH import com.android.settings.contract.KEY_BLUETOOTH
import com.android.settings.metrics.PreferenceActionMetricsProvider import com.android.settings.metrics.PreferenceActionMetricsProvider
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.restriction.PreferenceRestrictionMixin
import com.android.settings.widget.MainSwitchBarMetadata import com.android.settings.widget.MainSwitchBarMetadata
import com.android.settingslib.WirelessUtils import com.android.settingslib.WirelessUtils
import com.android.settingslib.datastore.AbstractKeyedDataObservable import com.android.settingslib.datastore.AbstractKeyedDataObservable

2
src/com/android/settings/display/AdaptiveSleepPreference.kt
View File

@@ -27,10 +27,10 @@ import android.hardware.SensorPrivacyManager.Sensors.CAMERA
import android.os.PowerManager import android.os.PowerManager
import android.os.UserManager import android.os.UserManager
import android.provider.Settings import android.provider.Settings
import com.android.settings.PreferenceRestrictionMixin
import com.android.settings.R import com.android.settings.R
import com.android.settings.contract.KEY_SCREEN_ATTENTION import com.android.settings.contract.KEY_SCREEN_ATTENTION
import com.android.settings.metrics.PreferenceActionMetricsProvider import com.android.settings.metrics.PreferenceActionMetricsProvider
import com.android.settings.restriction.PreferenceRestrictionMixin
import com.android.settingslib.RestrictedSwitchPreference import com.android.settingslib.RestrictedSwitchPreference
import com.android.settingslib.datastore.KeyValueStore import com.android.settingslib.datastore.KeyValueStore
import com.android.settingslib.datastore.KeyedObservableDelegate import com.android.settingslib.datastore.KeyedObservableDelegate

2
src/com/android/settings/display/AmbientDisplayAlwaysOnPreference.kt
View File

@@ -23,11 +23,11 @@ import android.os.SystemProperties
import android.os.UserHandle import android.os.UserHandle
import android.os.UserManager import android.os.UserManager
import android.provider.Settings.Secure.DOZE_ALWAYS_ON import android.provider.Settings.Secure.DOZE_ALWAYS_ON
import com.android.settings.PreferenceRestrictionMixin
import com.android.settings.R import com.android.settings.R
import com.android.settings.contract.KEY_AMBIENT_DISPLAY_ALWAYS_ON import com.android.settings.contract.KEY_AMBIENT_DISPLAY_ALWAYS_ON
import com.android.settings.display.AmbientDisplayAlwaysOnPreferenceController.isAodSuppressedByBedtime import com.android.settings.display.AmbientDisplayAlwaysOnPreferenceController.isAodSuppressedByBedtime
import com.android.settings.metrics.PreferenceActionMetricsProvider import com.android.settings.metrics.PreferenceActionMetricsProvider
import com.android.settings.restriction.PreferenceRestrictionMixin
import com.android.settingslib.datastore.AbstractKeyedDataObservable import com.android.settingslib.datastore.AbstractKeyedDataObservable
import com.android.settingslib.datastore.HandlerExecutor import com.android.settingslib.datastore.HandlerExecutor
import com.android.settingslib.datastore.KeyValueStore import com.android.settingslib.datastore.KeyValueStore

2
src/com/android/settings/display/AutoBrightnessScreen.kt
View File

@@ -23,11 +23,11 @@ import android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC
import android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL import android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL
import androidx.preference.Preference import androidx.preference.Preference
import androidx.preference.PreferenceScreen import androidx.preference.PreferenceScreen
import com.android.settings.PreferenceRestrictionMixin
import com.android.settings.R import com.android.settings.R
import com.android.settings.contract.KEY_ADAPTIVE_BRIGHTNESS import com.android.settings.contract.KEY_ADAPTIVE_BRIGHTNESS
import com.android.settings.flags.Flags import com.android.settings.flags.Flags
import com.android.settings.metrics.PreferenceActionMetricsProvider import com.android.settings.metrics.PreferenceActionMetricsProvider
import com.android.settings.restriction.PreferenceRestrictionMixin
import com.android.settingslib.PrimarySwitchPreferenceBinding import com.android.settingslib.PrimarySwitchPreferenceBinding
import com.android.settingslib.datastore.AbstractKeyedDataObservable import com.android.settingslib.datastore.AbstractKeyedDataObservable
import com.android.settingslib.datastore.HandlerExecutor import com.android.settingslib.datastore.HandlerExecutor

2
src/com/android/settings/display/BrightnessLevelPreference.kt
View File

@@ -27,12 +27,12 @@ import android.hardware.display.DisplayManager.DisplayListener
import android.os.UserManager import android.os.UserManager
import android.provider.Settings.System import android.provider.Settings.System
import androidx.preference.Preference import androidx.preference.Preference
import com.android.settings.PreferenceRestrictionMixin
import com.android.settings.R import com.android.settings.R
import com.android.settings.Utils import com.android.settings.Utils
import com.android.settings.contract.KEY_BRIGHTNESS_LEVEL import com.android.settings.contract.KEY_BRIGHTNESS_LEVEL
import com.android.settings.core.SettingsBaseActivity import com.android.settings.core.SettingsBaseActivity
import com.android.settings.metrics.PreferenceActionMetricsProvider import com.android.settings.metrics.PreferenceActionMetricsProvider
import com.android.settings.restriction.PreferenceRestrictionMixin
import com.android.settingslib.RestrictedPreference import com.android.settingslib.RestrictedPreference
import com.android.settingslib.datastore.AbstractKeyedDataObservable import com.android.settingslib.datastore.AbstractKeyedDataObservable
import com.android.settingslib.datastore.HandlerExecutor import com.android.settingslib.datastore.HandlerExecutor

2
src/com/android/settings/network/AirplaneModePreference.kt
View File

@@ -30,12 +30,12 @@ import android.telephony.TelephonyManager
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
import androidx.preference.Preference import androidx.preference.Preference
import com.android.settings.AirplaneModeEnabler import com.android.settings.AirplaneModeEnabler
import com.android.settings.PreferenceRestrictionMixin
import com.android.settings.R import com.android.settings.R
import com.android.settings.Utils import com.android.settings.Utils
import com.android.settings.contract.KEY_AIRPLANE_MODE import com.android.settings.contract.KEY_AIRPLANE_MODE
import com.android.settings.metrics.PreferenceActionMetricsProvider import com.android.settings.metrics.PreferenceActionMetricsProvider
import com.android.settings.network.SatelliteRepository.Companion.isSatelliteOn import com.android.settings.network.SatelliteRepository.Companion.isSatelliteOn
import com.android.settings.restriction.PreferenceRestrictionMixin
import com.android.settingslib.RestrictedSwitchPreference import com.android.settingslib.RestrictedSwitchPreference
import com.android.settingslib.datastore.AbstractKeyedDataObservable import com.android.settingslib.datastore.AbstractKeyedDataObservable
import com.android.settingslib.datastore.KeyValueStore import com.android.settingslib.datastore.KeyValueStore

2
src/com/android/settings/network/MobileNetworkListScreen.kt
View File

@@ -22,7 +22,6 @@ import android.telephony.SubscriptionManager
import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener
import androidx.preference.Preference import androidx.preference.Preference
import androidx.preference.Preference.OnPreferenceClickListener import androidx.preference.Preference.OnPreferenceClickListener
import com.android.settings.PreferenceRestrictionMixin
import com.android.settings.R import com.android.settings.R
import com.android.settings.flags.Flags import com.android.settings.flags.Flags
import com.android.settings.network.AirplaneModePreference.Companion.isAirplaneModeOn 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.SimRepository
import com.android.settings.network.telephony.SubscriptionRepository import com.android.settings.network.telephony.SubscriptionRepository
import com.android.settings.network.telephony.euicc.EuiccRepository 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.getAddSimIntent
import com.android.settings.spa.network.startAddSimFlow import com.android.settings.spa.network.startAddSimFlow
import com.android.settingslib.RestrictedPreference import com.android.settingslib.RestrictedPreference

7
src/com/android/settings/network/NetworkProviderScreen.kt
View File

@@ -17,9 +17,9 @@ package com.android.settings.network
import android.content.Context import android.content.Context
import android.os.UserManager import android.os.UserManager
import com.android.settings.PreferenceRestrictionMixin
import com.android.settings.R import com.android.settings.R
import com.android.settings.flags.Flags import com.android.settings.flags.Flags
import com.android.settings.restriction.PreferenceRestrictionMixin
import com.android.settings.wifi.WifiSwitchPreference import com.android.settings.wifi.WifiSwitchPreference
import com.android.settingslib.metadata.PreferenceAvailabilityProvider import com.android.settingslib.metadata.PreferenceAvailabilityProvider
import com.android.settingslib.metadata.ProvidePreferenceScreen import com.android.settingslib.metadata.ProvidePreferenceScreen
@@ -55,9 +55,8 @@ class NetworkProviderScreen :
override fun fragmentClass() = NetworkProviderSettings::class.java override fun fragmentClass() = NetworkProviderSettings::class.java
override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(context, this) { override fun getPreferenceHierarchy(context: Context) =
+WifiSwitchPreference() preferenceHierarchy(context, this) { +WifiSwitchPreference() }
}
companion object { companion object {
const val KEY = "internet_settings" const val KEY = "internet_settings"

2
src/com/android/settings/network/tether/TetherScreen.kt
View File

@@ -18,12 +18,12 @@ package com.android.settings.network.tether
import android.content.Context import android.content.Context
import android.net.TetheringManager import android.net.TetheringManager
import android.os.UserManager import android.os.UserManager
import com.android.settings.PreferenceRestrictionMixin
import com.android.settings.R import com.android.settings.R
import com.android.settings.Settings.TetherSettingsActivity import com.android.settings.Settings.TetherSettingsActivity
import com.android.settings.datausage.DataSaverMainSwitchPreference import com.android.settings.datausage.DataSaverMainSwitchPreference
import com.android.settings.flags.Flags import com.android.settings.flags.Flags
import com.android.settings.network.TetherPreferenceController import com.android.settings.network.TetherPreferenceController
import com.android.settings.restriction.PreferenceRestrictionMixin
import com.android.settings.utils.makeLaunchIntent import com.android.settings.utils.makeLaunchIntent
import com.android.settings.wifi.tether.WifiHotspotSwitchPreference import com.android.settings.wifi.tether.WifiHotspotSwitchPreference
import com.android.settingslib.TetherUtil import com.android.settingslib.TetherUtil

2
src/com/android/settings/notification/CallVolumePreference.kt
View File

@@ -27,10 +27,10 @@ import android.media.AudioManager.STREAM_BLUETOOTH_SCO
import android.media.AudioManager.STREAM_VOICE_CALL import android.media.AudioManager.STREAM_VOICE_CALL
import android.os.UserManager import android.os.UserManager
import androidx.preference.Preference import androidx.preference.Preference
import com.android.settings.PreferenceRestrictionMixin
import com.android.settings.R import com.android.settings.R
import com.android.settings.contract.KEY_CALL_VOLUME import com.android.settings.contract.KEY_CALL_VOLUME
import com.android.settings.metrics.PreferenceActionMetricsProvider import com.android.settings.metrics.PreferenceActionMetricsProvider
import com.android.settings.restriction.PreferenceRestrictionMixin
import com.android.settingslib.datastore.KeyValueStore import com.android.settingslib.datastore.KeyValueStore
import com.android.settingslib.datastore.NoOpKeyedObservable import com.android.settingslib.datastore.NoOpKeyedObservable
import com.android.settingslib.datastore.Permissions import com.android.settingslib.datastore.Permissions

2
src/com/android/settings/notification/MediaVolumePreference.kt
View File

@@ -24,10 +24,10 @@ import android.content.pm.PackageManager.FEATURE_AUTOMOTIVE
import android.media.AudioManager.STREAM_MUSIC import android.media.AudioManager.STREAM_MUSIC
import android.os.UserManager import android.os.UserManager
import androidx.preference.Preference import androidx.preference.Preference
import com.android.settings.PreferenceRestrictionMixin
import com.android.settings.R import com.android.settings.R
import com.android.settings.contract.KEY_MEDIA_VOLUME import com.android.settings.contract.KEY_MEDIA_VOLUME
import com.android.settings.metrics.PreferenceActionMetricsProvider import com.android.settings.metrics.PreferenceActionMetricsProvider
import com.android.settings.restriction.PreferenceRestrictionMixin
import com.android.settingslib.datastore.KeyValueStore import com.android.settingslib.datastore.KeyValueStore
import com.android.settingslib.datastore.NoOpKeyedObservable import com.android.settingslib.datastore.NoOpKeyedObservable
import com.android.settingslib.datastore.Permissions import com.android.settingslib.datastore.Permissions

2
src/com/android/settings/notification/SeparateRingVolumePreference.kt
View File

@@ -40,10 +40,10 @@ import android.os.Vibrator
import android.service.notification.NotificationListenerService.HINT_HOST_DISABLE_CALL_EFFECTS import android.service.notification.NotificationListenerService.HINT_HOST_DISABLE_CALL_EFFECTS
import android.service.notification.NotificationListenerService.HINT_HOST_DISABLE_EFFECTS import android.service.notification.NotificationListenerService.HINT_HOST_DISABLE_EFFECTS
import androidx.preference.Preference import androidx.preference.Preference
import com.android.settings.PreferenceRestrictionMixin
import com.android.settings.R import com.android.settings.R
import com.android.settings.contract.KEY_RING_VOLUME import com.android.settings.contract.KEY_RING_VOLUME
import com.android.settings.metrics.PreferenceActionMetricsProvider import com.android.settings.metrics.PreferenceActionMetricsProvider
import com.android.settings.restriction.PreferenceRestrictionMixin
import com.android.settingslib.datastore.KeyValueStore import com.android.settingslib.datastore.KeyValueStore
import com.android.settingslib.datastore.NoOpKeyedObservable import com.android.settingslib.datastore.NoOpKeyedObservable
import com.android.settingslib.datastore.Permissions import com.android.settingslib.datastore.Permissions

2
src/com/android/settings/PreferenceRestrictionMixin.kt → src/com/android/settings/restriction/PreferenceRestrictionMixin.kt
View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.settings package com.android.settings.restriction
import android.content.Context import android.content.Context
import android.os.UserHandle import android.os.UserHandle

1
src/com/android/settings/restriction/UserRestrictionBindingHelper.kt
View File

@@ -17,7 +17,6 @@
package com.android.settings.restriction package com.android.settings.restriction
import android.content.Context import android.content.Context
import com.android.settings.PreferenceRestrictionMixin
import com.android.settingslib.datastore.HandlerExecutor import com.android.settingslib.datastore.HandlerExecutor
import com.android.settingslib.datastore.KeyedObserver import com.android.settingslib.datastore.KeyedObserver
import com.android.settingslib.metadata.PreferenceChangeReason import com.android.settingslib.metadata.PreferenceChangeReason

2
src/com/android/settings/wifi/WifiSwitchPreference.kt
View File

@@ -30,13 +30,13 @@ 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.PreferenceRestrictionMixin
import com.android.settings.R import com.android.settings.R
import com.android.settings.contract.KEY_WIFI import com.android.settings.contract.KEY_WIFI
import com.android.settings.metrics.PreferenceActionMetricsProvider import com.android.settings.metrics.PreferenceActionMetricsProvider
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
import com.android.settings.restriction.PreferenceRestrictionMixin
import com.android.settings.wifi.utils.isDefaultNetworkWifi import com.android.settings.wifi.utils.isDefaultNetworkWifi
import com.android.settings.wifi.utils.isWifiEnabled import com.android.settings.wifi.utils.isWifiEnabled
import com.android.settings.wifi.utils.wifiManager import com.android.settings.wifi.utils.wifiManager

2
src/com/android/settings/wifi/tether/WifiHotspotSwitchPreference.kt
View File

@@ -28,13 +28,13 @@ import android.net.wifi.WifiManager
import android.os.UserManager import android.os.UserManager
import android.text.BidiFormatter import android.text.BidiFormatter
import android.util.Log import android.util.Log
import com.android.settings.PreferenceRestrictionMixin
import com.android.settings.R import com.android.settings.R
import com.android.settings.Utils import com.android.settings.Utils
import com.android.settings.contract.KEY_WIFI_HOTSPOT import com.android.settings.contract.KEY_WIFI_HOTSPOT
import com.android.settings.core.SubSettingLauncher import com.android.settings.core.SubSettingLauncher
import com.android.settings.datausage.DataSaverMainSwitchPreference.Companion.KEY as DATA_SAVER_KEY import com.android.settings.datausage.DataSaverMainSwitchPreference.Companion.KEY as DATA_SAVER_KEY
import com.android.settings.metrics.PreferenceActionMetricsProvider import com.android.settings.metrics.PreferenceActionMetricsProvider
import com.android.settings.restriction.PreferenceRestrictionMixin
import com.android.settings.wifi.WifiUtils.canShowWifiHotspot import com.android.settings.wifi.WifiUtils.canShowWifiHotspot
import com.android.settings.wifi.utils.tetheringManager import com.android.settings.wifi.utils.tetheringManager
import com.android.settings.wifi.utils.wifiApState import com.android.settings.wifi.utils.wifiApState