[Catalyst] Provide screen key to @ProvidePreferenceScreen

NO_IFTTT=Catalyst only

Bug: 386179791
Flag: com.android.settings.flags.catalyst
Test: manual
Change-Id: Ie8106ec45a32e4a61826512fc62746c9ffc47d9c

src/com/android/settings/SettingsApplication.java

@@ -43,7 +43,8 @@ import com.android.settings.overlay.FeatureFactoryImpl;
 import com.android.settings.spa.SettingsSpaEnvironment;
 import com.android.settingslib.applications.AppIconCacheManager;
 import com.android.settingslib.datastore.BackupRestoreStorageManager;
-import com.android.settingslib.metadata.PreferenceScreenMetadata;
+import com.android.settingslib.metadata.FixedArrayMap;
+import com.android.settingslib.metadata.PreferenceScreenMetadataCreator;
 import com.android.settingslib.metadata.PreferenceScreenRegistry;
 import com.android.settingslib.metadata.ProvidePreferenceScreenOptions;
 import com.android.settingslib.preference.PreferenceBindingFactory;
@@ -52,7 +53,6 @@ import com.android.settingslib.spa.framework.common.SpaEnvironmentFactory;
 import com.google.android.setupcompat.util.WizardManagerHelper;
 
 import java.lang.ref.WeakReference;
-import java.util.List;
 
 /** Settings application which sets up activity embedding rules for the large screen device. */
 @ProvidePreferenceScreenOptions(
@@ -75,8 +75,8 @@ public class SettingsApplication extends Application {
         super.onCreate();
 
         if (Flags.catalyst()) {
-            PreferenceScreenRegistry.INSTANCE.setPreferenceScreensSupplier(
+            PreferenceScreenRegistry.INSTANCE.setPreferenceScreenMetadataCreators(
-                    this::getPreferenceScreens);
+                    getPreferenceScreenCreators());
             PreferenceBindingFactory.setDefaultFactory(new SettingsPreferenceBindingFactory());
         }
 
@@ -106,11 +106,11 @@ public class SettingsApplication extends Application {
         registerActivityLifecycleCallbacks(new DeveloperOptionsActivityLifecycle());
     }
 
-    /** Returns the screens using metadata. */
+    /** Returns the creators of preference screen metadata. */
-    protected List<PreferenceScreenMetadata> getPreferenceScreens() {
+    protected FixedArrayMap<String, PreferenceScreenMetadataCreator> getPreferenceScreenCreators() {
         // PreferenceScreenCollector is generated by annotation processor from classes annotated
         // with @ProvidePreferenceScreen
-        return PreferenceScreenCollector.get(this);
+        return PreferenceScreenCollector.get();
     }
 
     @Override

src/com/android/settings/accessibility/ColorAndMotionScreen.kt

@@ -26,7 +26,7 @@ import com.android.settingslib.metadata.ProvidePreferenceScreen
 import com.android.settingslib.metadata.preferenceHierarchy
 import com.android.settingslib.preference.PreferenceScreenCreator
 
-@ProvidePreferenceScreen
+@ProvidePreferenceScreen(ColorAndMotionScreen.KEY)
 class ColorAndMotionScreen : PreferenceScreenCreator {
     override val key: String
         get() = KEY
@@ -44,7 +44,7 @@ class ColorAndMotionScreen : PreferenceScreenCreator {
     override fun fragmentClass() = ColorAndMotionFragment::class.java
 
     override fun getPreferenceHierarchy(context: Context) =
-        preferenceHierarchy(this) {
+        preferenceHierarchy(context, this) {
             +RemoveAnimationsPreference()
         }
 

src/com/android/settings/accessibility/TextReadingScreen.kt

@@ -22,7 +22,7 @@ import com.android.settingslib.metadata.ProvidePreferenceScreen
 import com.android.settingslib.metadata.preferenceHierarchy
 import com.android.settingslib.preference.PreferenceScreenCreator
 
-@ProvidePreferenceScreen
+@ProvidePreferenceScreen(TextReadingScreen.KEY)
 class TextReadingScreen : PreferenceScreenCreator {
     override val key: String
         get() = KEY
@@ -36,7 +36,7 @@ class TextReadingScreen : PreferenceScreenCreator {
 
     override fun hasCompleteHierarchy() = false
 
-    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(context, this) {}
 
     companion object {
         const val KEY = "text_reading_screen"

src/com/android/settings/accessibility/VibrationIntensityScreen.kt

@@ -31,7 +31,7 @@ import com.android.settingslib.preference.PreferenceScreenCreator
 //  We might be able to consolidate this into VibrationScreen with PreferenceHierarchy choosing
 //  between toggle or slider preferences based on device config, depending on how overlays are done.
 // LINT.IfChange
-@ProvidePreferenceScreen
+@ProvidePreferenceScreen(VibrationIntensityScreen.KEY)
 class VibrationIntensityScreen : PreferenceScreenCreator, PreferenceAvailabilityProvider {
     override val key: String
         get() = KEY
@@ -52,7 +52,7 @@ class VibrationIntensityScreen : PreferenceScreenCreator, PreferenceAvailability
     override fun fragmentClass(): Class<out Fragment>? =
         VibrationIntensitySettingsFragment::class.java
 
-    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(context, this) {
         +VibrationMainSwitchPreference()
     }
 

src/com/android/settings/accessibility/VibrationScreen.kt

@@ -29,7 +29,7 @@ import com.android.settingslib.preference.PreferenceScreenCreator
  * Accessibility settings for vibration.
  */
 // LINT.IfChange
-@ProvidePreferenceScreen
+@ProvidePreferenceScreen(VibrationScreen.KEY)
 class VibrationScreen : PreferenceScreenCreator, PreferenceAvailabilityProvider {
     override val key: String
         get() = KEY
@@ -49,7 +49,7 @@ class VibrationScreen : PreferenceScreenCreator, PreferenceAvailabilityProvider
 
     override fun fragmentClass(): Class<out Fragment>? = VibrationSettings::class.java
 
-    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(context, this) {
         +VibrationMainSwitchPreference()
     }
 

src/com/android/settings/connecteddevice/BluetoothDashboardScreen.kt

@@ -25,7 +25,7 @@ import com.android.settingslib.metadata.ProvidePreferenceScreen
 import com.android.settingslib.metadata.preferenceHierarchy
 import com.android.settingslib.preference.PreferenceScreenCreator
 
-@ProvidePreferenceScreen
+@ProvidePreferenceScreen(BluetoothDashboardScreen.KEY)
 class BluetoothDashboardScreen : PreferenceScreenCreator {
     override val key: String
         get() = KEY
@@ -46,7 +46,7 @@ class BluetoothDashboardScreen : PreferenceScreenCreator {
         makeLaunchIntent(context, BluetoothDashboardActivity::class.java, metadata?.key)
 
     override fun getPreferenceHierarchy(context: Context) =
-        preferenceHierarchy(this) {
+        preferenceHierarchy(context, this) {
             val bluetoothDataStore = BluetoothPreference.createDataStore(context)
             +BluetoothPreference(bluetoothDataStore)
             +BluetoothFooterPreference(bluetoothDataStore)

src/com/android/settings/datausage/DataSaverScreen.kt

@@ -20,6 +20,7 @@ import android.content.Context
 import android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID
 import com.android.settings.R
 import com.android.settings.Settings.DataSaverSummaryActivity
+import com.android.settings.datausage.DataSaverMainSwitchPreference.Companion.KEY as DATA_SAVER_KEY
 import com.android.settings.flags.Flags
 import com.android.settings.utils.makeLaunchIntent
 import com.android.settingslib.datastore.HandlerExecutor
@@ -32,9 +33,8 @@ import com.android.settingslib.metadata.PreferenceSummaryProvider
 import com.android.settingslib.metadata.ProvidePreferenceScreen
 import com.android.settingslib.metadata.preferenceHierarchy
 import com.android.settingslib.preference.PreferenceScreenCreator
-import com.android.settings.datausage.DataSaverMainSwitchPreference.Companion.KEY as DATA_SAVER_KEY
 
-@ProvidePreferenceScreen
+@ProvidePreferenceScreen(DataSaverScreen.KEY)
 class DataSaverScreen(context: Context) :
     PreferenceScreenCreator,
     PreferenceAvailabilityProvider,
@@ -75,7 +75,7 @@ class DataSaverScreen(context: Context) :
         makeLaunchIntent(context, DataSaverSummaryActivity::class.java, metadata?.key)
 
     override fun getPreferenceHierarchy(context: Context) =
-        preferenceHierarchy(this) { +DataSaverMainSwitchPreference() }
+        preferenceHierarchy(context, this) { +DataSaverMainSwitchPreference() }
 
     override fun hasCompleteHierarchy() = false
 

src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoScreen.kt

@@ -27,7 +27,7 @@ import com.android.settingslib.metadata.ProvidePreferenceScreen
 import com.android.settingslib.metadata.preferenceHierarchy
 import com.android.settingslib.preference.PreferenceScreenCreator
 
-@ProvidePreferenceScreen
+@ProvidePreferenceScreen(MyDeviceInfoScreen.KEY)
 class MyDeviceInfoScreen :
     PreferenceScreenCreator, PreferenceSummaryProvider, PreferenceIconProvider {
     override val key: String
@@ -52,7 +52,7 @@ class MyDeviceInfoScreen :
 
     override fun fragmentClass() = MyDeviceInfoFragment::class.java
 
-    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(context, this) {}
 
     override fun hasCompleteHierarchy() = false
 

src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionScreen.kt

@@ -25,7 +25,7 @@ import com.android.settingslib.metadata.ProvidePreferenceScreen
 import com.android.settingslib.metadata.preferenceHierarchy
 import com.android.settingslib.preference.PreferenceScreenCreator
 
-@ProvidePreferenceScreen
+@ProvidePreferenceScreen(FirmwareVersionScreen.KEY)
 class FirmwareVersionScreen : PreferenceScreenCreator, PreferenceSummaryProvider {
 
     override fun isFlagEnabled(context: Context) = Flags.catalystFirmwareVersion()
@@ -45,7 +45,7 @@ class FirmwareVersionScreen : PreferenceScreenCreator, PreferenceSummaryProvider
     override fun fragmentClass() = FirmwareVersionSettings::class.java
 
     override fun getPreferenceHierarchy(context: Context) =
-        preferenceHierarchy(this) {
+        preferenceHierarchy(context, this) {
             +FirmwareVersionDetailPreference()
             +SecurityPatchLevelPreference()
             +MainlineModuleVersionPreference()

src/com/android/settings/deviceinfo/legal/LegalSettingsScreen.kt

@@ -23,7 +23,7 @@ import com.android.settingslib.metadata.ProvidePreferenceScreen
 import com.android.settingslib.metadata.preferenceHierarchy
 import com.android.settingslib.preference.PreferenceScreenCreator
 
-@ProvidePreferenceScreen
+@ProvidePreferenceScreen(LegalSettingsScreen.KEY)
 open class LegalSettingsScreen : PreferenceScreenCreator {
     override val key: String
         get() = KEY
@@ -36,7 +36,7 @@ open class LegalSettingsScreen : PreferenceScreenCreator {
     override fun fragmentClass() = LegalSettings::class.java
 
     override fun getPreferenceHierarchy(context: Context) =
-        preferenceHierarchy(this) {
+        preferenceHierarchy(context, this) {
             +LegalPreference("copyright", R.string.copyright_title, "android.settings.COPYRIGHT")
             +LegalPreference("license", R.string.license_title, "android.settings.LICENSE")
             +LegalPreference("terms", R.string.terms_title, "android.settings.TERMS")

src/com/android/settings/deviceinfo/legal/ModuleLicensesScreen.kt

@@ -23,7 +23,7 @@ import com.android.settingslib.metadata.preferenceHierarchy
 import com.android.settingslib.preference.PreferenceScreenCreator
 
 // LINT.IfChange
-@ProvidePreferenceScreen
+@ProvidePreferenceScreen(ModuleLicensesScreen.KEY)
 class ModuleLicensesScreen : PreferenceScreenCreator, PreferenceAvailabilityProvider {
     override val key: String
         get() = KEY
@@ -39,7 +39,7 @@ class ModuleLicensesScreen : PreferenceScreenCreator, PreferenceAvailabilityProv
 
     override fun fragmentClass() = ModuleLicensesDashboard::class.java
 
-    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(context, this) {}
 
     override fun isAvailable(context: Context): Boolean {
         val modules = context.packageManager.getInstalledModules(/* flags= */ 0)

src/com/android/settings/display/AutoBrightnessScreen.kt

@@ -40,7 +40,7 @@ import com.android.settingslib.metadata.preferenceHierarchy
 import com.android.settingslib.preference.PreferenceScreenBinding
 import com.android.settingslib.preference.PreferenceScreenCreator
 
-@ProvidePreferenceScreen
+@ProvidePreferenceScreen(AutoBrightnessScreen.KEY)
 class AutoBrightnessScreen :
     PreferenceScreenCreator,
     PreferenceScreenBinding,
@@ -60,7 +60,7 @@ class AutoBrightnessScreen :
 
     override fun hasCompleteHierarchy() = false
 
-    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(context, this) {}
 
     override fun storage(context: Context): KeyValueStore =
         AutoBrightnessDataStore(SettingsSystemStore.get(context))

src/com/android/settings/display/DisplayScreen.kt

@@ -30,7 +30,7 @@ import com.android.settingslib.metadata.ProvidePreferenceScreen
 import com.android.settingslib.metadata.preferenceHierarchy
 import com.android.settingslib.preference.PreferenceScreenCreator
 
-@ProvidePreferenceScreen
+@ProvidePreferenceScreen(DisplayScreen.KEY)
 open class DisplayScreen :
     PreferenceScreenCreator, PreferenceAvailabilityProvider, PreferenceIconProvider {
     override val key: String
@@ -52,7 +52,7 @@ open class DisplayScreen :
     override fun fragmentClass() = DisplaySettings::class.java
 
     override fun getPreferenceHierarchy(context: Context) =
-        preferenceHierarchy(this) {
+        preferenceHierarchy(context, this) {
             +BrightnessLevelPreference()
             +AutoBrightnessScreen.KEY
             +LockScreenPreferenceScreen.KEY

src/com/android/settings/display/ScreenTimeoutScreen.kt

@@ -27,7 +27,7 @@ import com.android.settingslib.metadata.preferenceHierarchy
 import com.android.settingslib.preference.PreferenceScreenCreator
 
 // TODO(b/368359967): The entry point logic is not yet migrated
-@ProvidePreferenceScreen
+@ProvidePreferenceScreen(ScreenTimeoutScreen.KEY)
 class ScreenTimeoutScreen : PreferenceScreenCreator {
 
     override val key: String
@@ -43,7 +43,7 @@ class ScreenTimeoutScreen : PreferenceScreenCreator {
     override fun hasCompleteHierarchy() = false
 
     override fun getPreferenceHierarchy(context: Context) =
-        preferenceHierarchy(this) { +AdaptiveSleepPreference() }
+        preferenceHierarchy(context, this) { +AdaptiveSleepPreference() }
 
     override fun getLaunchIntent(context: Context, metadata: PreferenceMetadata?) =
         makeLaunchIntent(context, ScreenTimeoutActivity::class.java, metadata?.key)

src/com/android/settings/display/darkmode/DarkModeScreen.kt

@@ -37,7 +37,7 @@ import com.android.settingslib.preference.PreferenceScreenBinding
 import com.android.settingslib.preference.PreferenceScreenCreator
 
 // LINT.IfChange
-@ProvidePreferenceScreen
+@ProvidePreferenceScreen(DarkModeScreen.KEY)
 class DarkModeScreen(context: Context) :
     PreferenceScreenCreator,
     PreferenceScreenBinding,
@@ -80,7 +80,7 @@ class DarkModeScreen(context: Context) :
 
     override fun hasCompleteHierarchy() = false
 
-    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(context, this) {}
 
     override fun storage(context: Context): KeyValueStore = darkModeStorage
 
@@ -89,8 +89,8 @@ class DarkModeScreen(context: Context) :
     override fun bind(preference: Preference, metadata: PreferenceMetadata) {
         super.bind(preference, metadata)
         if (preference is DarkModePreference) preference.setCatalystEnabled(true)
-        (preference as PrimarySwitchPreference).apply {
+        (preference as? PrimarySwitchPreference)?.apply {
-            isSwitchEnabled = isEnabled()
+            isSwitchEnabled = isEnabled
             isChecked = darkModeStorage.getBoolean(KEY) == true
         }
     }

src/com/android/settings/fuelgauge/batterysaver/BatterySaverScreen.kt

@@ -22,7 +22,7 @@ import com.android.settingslib.metadata.ProvidePreferenceScreen
 import com.android.settingslib.metadata.preferenceHierarchy
 import com.android.settingslib.preference.PreferenceScreenCreator
 
-@ProvidePreferenceScreen
+@ProvidePreferenceScreen(BatterySaverScreen.KEY)
 open class BatterySaverScreen : PreferenceScreenCreator {
     override val key: String
         get() = KEY
@@ -40,7 +40,7 @@ open class BatterySaverScreen : PreferenceScreenCreator {
     override fun hasCompleteHierarchy() = false
 
     override fun getPreferenceHierarchy(context: Context) =
-        preferenceHierarchy(this) { +BatterySaverPreference() order -100 }
+        preferenceHierarchy(context, this) { +BatterySaverPreference() order -100 }
 
     companion object {
         const val KEY = "battery_saver_screen"

src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryScreen.kt

@@ -26,7 +26,7 @@ import com.android.settingslib.metadata.ProvidePreferenceScreen
 import com.android.settingslib.metadata.preferenceHierarchy
 import com.android.settingslib.preference.PreferenceScreenCreator
 
-@ProvidePreferenceScreen
+@ProvidePreferenceScreen(PowerUsageSummaryScreen.KEY)
 class PowerUsageSummaryScreen :
     PreferenceScreenCreator, PreferenceAvailabilityProvider, PreferenceIconProvider {
     override val key: String
@@ -54,10 +54,11 @@ class PowerUsageSummaryScreen :
             R.drawable.ic_settings_battery_white
         }
 
-    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {
+    override fun getPreferenceHierarchy(context: Context) =
-        +BatteryHeaderPreference()
+        preferenceHierarchy(context, this) {
-        +BatteryPercentageSwitchPreference()
+            +BatteryHeaderPreference()
-    }
+            +BatteryPercentageSwitchPreference()
+        }
 
     companion object {
         const val KEY = "power_usage_summary_screen"

src/com/android/settings/language/LanguageSettingScreen.kt

@@ -15,19 +15,15 @@
  */
 package com.android.settings.language
 
-import android.content.ComponentName
 import android.content.Context
-import android.content.pm.PackageManager
 import com.android.settings.R
-import com.android.settings.Settings.LanguageSettingsActivity
 import com.android.settings.flags.Flags
-import com.android.settingslib.metadata.PreferenceAvailabilityProvider
 import com.android.settingslib.metadata.ProvidePreferenceScreen
 import com.android.settingslib.metadata.preferenceHierarchy
 import com.android.settingslib.preference.PreferenceScreenCreator
 
-@ProvidePreferenceScreen
+@ProvidePreferenceScreen(LanguageSettingScreen.KEY)
-class LanguageSettingScreen: PreferenceScreenCreator {
+class LanguageSettingScreen : PreferenceScreenCreator {
     override val key: String
         get() = KEY
 
@@ -46,7 +42,7 @@ class LanguageSettingScreen: PreferenceScreenCreator {
 
     override fun fragmentClass() = LanguageSettings::class.java
 
-    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(context, this) {}
 
     companion object {
         const val KEY = "language_setting"

src/com/android/settings/location/LocationScreen.kt

@@ -25,7 +25,7 @@ import com.android.settingslib.metadata.ProvidePreferenceScreen
 import com.android.settingslib.metadata.preferenceHierarchy
 import com.android.settingslib.preference.PreferenceScreenCreator
 
-@ProvidePreferenceScreen
+@ProvidePreferenceScreen(LocationScreen.KEY)
 class LocationScreen : PreferenceScreenCreator, PreferenceSummaryProvider, PreferenceIconProvider {
     override val key: String
         get() = KEY
@@ -57,7 +57,7 @@ class LocationScreen : PreferenceScreenCreator, PreferenceSummaryProvider, Prefe
 
     override fun fragmentClass() = LocationSettings::class.java
 
-    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(context, this) {}
 
     companion object {
         const val KEY = "location_settings"

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

@@ -23,7 +23,7 @@ import com.android.settingslib.metadata.ProvidePreferenceScreen
 import com.android.settingslib.metadata.preferenceHierarchy
 import com.android.settingslib.preference.PreferenceScreenCreator
 
-@ProvidePreferenceScreen
+@ProvidePreferenceScreen(AdaptiveConnectivityScreen.KEY)
 class AdaptiveConnectivityScreen : PreferenceScreenCreator {
     override val key
         get() = KEY
@@ -35,7 +35,7 @@ class AdaptiveConnectivityScreen : PreferenceScreenCreator {
 
     override fun fragmentClass() = AdaptiveConnectivitySettings::class.java
 
-    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(context, this) {
         +AdaptiveConnectivityTogglePreference()
     }
 

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

@@ -46,7 +46,7 @@ import com.android.settingslib.metadata.preferenceHierarchy
 import com.android.settingslib.preference.PreferenceScreenBinding
 import com.android.settingslib.preference.PreferenceScreenCreator
 
-@ProvidePreferenceScreen
+@ProvidePreferenceScreen(MobileNetworkListScreen.KEY)
 class MobileNetworkListScreen :
     PreferenceScreenCreator,
     PreferenceScreenBinding,
@@ -160,7 +160,7 @@ class MobileNetworkListScreen :
     override fun fragmentClass() = MobileNetworkListFragment::class.java
 
     override fun getPreferenceHierarchy(context: Context) =
-        preferenceHierarchy(this) { +MobileDataPreference() }
+        preferenceHierarchy(context, this) { +MobileDataPreference() }
 
     companion object {
         const val KEY = "mobile_network_list"

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

@@ -27,7 +27,7 @@ import com.android.settingslib.metadata.ProvidePreferenceScreen
 import com.android.settingslib.metadata.preferenceHierarchy
 import com.android.settingslib.preference.PreferenceScreenCreator
 
-@ProvidePreferenceScreen
+@ProvidePreferenceScreen(NetworkDashboardScreen.KEY)
 class NetworkDashboardScreen : PreferenceScreenCreator, PreferenceIconProvider {
     override val key: String
         get() = KEY
@@ -51,7 +51,7 @@ class NetworkDashboardScreen : PreferenceScreenCreator, PreferenceIconProvider {
         makeLaunchIntent(context, NetworkDashboardActivity::class.java, metadata?.key)
 
     override fun getPreferenceHierarchy(context: Context) =
-        preferenceHierarchy(this) {
+        preferenceHierarchy(context, this) {
             +MobileNetworkListScreen.KEY order -15
             +AirplaneModePreference() order -5
             +DataSaverScreen.KEY order 10

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

@@ -26,7 +26,7 @@ import com.android.settingslib.metadata.ProvidePreferenceScreen
 import com.android.settingslib.metadata.preferenceHierarchy
 import com.android.settingslib.preference.PreferenceScreenCreator
 
-@ProvidePreferenceScreen
+@ProvidePreferenceScreen(NetworkProviderScreen.KEY)
 class NetworkProviderScreen :
     PreferenceScreenCreator, PreferenceAvailabilityProvider, PreferenceRestrictionMixin {
     override val key: String
@@ -55,7 +55,7 @@ class NetworkProviderScreen :
 
     override fun fragmentClass() = NetworkProviderSettings::class.java
 
-    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(context, this) {
         +WifiSwitchPreference()
     }
 

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

@@ -35,7 +35,7 @@ import com.android.settingslib.metadata.ProvidePreferenceScreen
 import com.android.settingslib.metadata.preferenceHierarchy
 import com.android.settingslib.preference.PreferenceScreenCreator
 
-@ProvidePreferenceScreen
+@ProvidePreferenceScreen(TetherScreen.KEY)
 class TetherScreen :
     PreferenceScreenCreator,
     PreferenceTitleProvider,
@@ -76,7 +76,7 @@ class TetherScreen :
         makeLaunchIntent(context, TetherSettingsActivity::class.java, metadata?.key)
 
     override fun getPreferenceHierarchy(context: Context) =
-        preferenceHierarchy(this) {
+        preferenceHierarchy(context, this) {
             val dataSaverStore = DataSaverMainSwitchPreference.createDataStore(context)
             +WifiHotspotSwitchPreference(context, dataSaverStore)
         }

src/com/android/settings/notification/SoundScreen.kt

@@ -27,7 +27,7 @@ import com.android.settingslib.metadata.ProvidePreferenceScreen
 import com.android.settingslib.metadata.preferenceHierarchy
 import com.android.settingslib.preference.PreferenceScreenCreator
 
-@ProvidePreferenceScreen
+@ProvidePreferenceScreen(SoundScreen.KEY)
 class SoundScreen : PreferenceScreenCreator, PreferenceIconProvider {
     override val key: String
         get() = KEY
@@ -51,7 +51,7 @@ class SoundScreen : PreferenceScreenCreator, PreferenceIconProvider {
     override fun fragmentClass(): Class<out Fragment>? = SoundSettings::class.java
 
     override fun getPreferenceHierarchy(context: Context) =
-        preferenceHierarchy(this) {
+        preferenceHierarchy(context, this) {
             +MediaVolumePreference() order -180
             +CallVolumePreference() order -170
             +SeparateRingVolumePreference() order -155

src/com/android/settings/security/LockScreenPreferenceScreen.kt

@@ -28,7 +28,7 @@ import com.android.settingslib.metadata.ProvidePreferenceScreen
 import com.android.settingslib.metadata.preferenceHierarchy
 import com.android.settingslib.preference.PreferenceScreenCreator
 
-@ProvidePreferenceScreen
+@ProvidePreferenceScreen(LockScreenPreferenceScreen.KEY)
 open class LockScreenPreferenceScreen : PreferenceScreenCreator, PreferenceSummaryProvider {
     override val key: String
         get() = KEY
@@ -52,7 +52,7 @@ open class LockScreenPreferenceScreen : PreferenceScreenCreator, PreferenceSumma
         makeLaunchIntent(context, LockScreenSettingsActivity::class.java, metadata?.key)
 
     override fun getPreferenceHierarchy(context: Context) =
-        preferenceHierarchy(this) {
+        preferenceHierarchy(context, this) {
             +AmbientDisplayAlwaysOnPreference()
         }
 

src/com/android/settings/wifi/calling/WifiCallingScreen.kt

@@ -23,7 +23,7 @@ import com.android.settingslib.metadata.ProvidePreferenceScreen
 import com.android.settingslib.metadata.preferenceHierarchy
 import com.android.settingslib.preference.PreferenceScreenCreator
 
-@ProvidePreferenceScreen
+@ProvidePreferenceScreen(WifiCallingScreen.KEY)
 class WifiCallingScreen : PreferenceScreenCreator {
     override val key: String
         get() = KEY
@@ -41,7 +41,7 @@ class WifiCallingScreen : PreferenceScreenCreator {
     override fun hasCompleteHierarchy() = false
 
     override fun getPreferenceHierarchy(context: Context) =
-        preferenceHierarchy(this) {
+        preferenceHierarchy(context, this) {
             val subId = SubscriptionManager.getDefaultSubscriptionId()
             if (SubscriptionManager.isValidSubscriptionId(subId)) {
                 +WifiCallingMainSwitchPreference(subId)