Merge "[Catalyst] Provide screen key to @ProvidePreferenceScreen" into main

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()
     }