Merge "[Catalyst] Provide screen key to @ProvidePreferenceScreen" into main (e095ce31) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/SettingsApplication.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -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(
		this::getPreferenceScreens);
		PreferenceScreenRegistry.INSTANCE.setPreferenceScreenMetadataCreators(
		getPreferenceScreenCreators());
		PreferenceBindingFactory.setDefaultFactory(new SettingsPreferenceBindingFactory());
		}

		@@ -106,11 +106,11 @@ public class SettingsApplication extends Application {
		registerActivityLifecycleCallbacks(new DeveloperOptionsActivityLifecycle());
		}

		/** Returns the screens using metadata. */
		protected List<PreferenceScreenMetadata> getPreferenceScreens() {
		/** Returns the creators of preference screen metadata. */
		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

+2 −2

Original line number	Diff line number	Diff line
		@@ -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

+2 −2

Original line number	Diff line number	Diff line
		@@ -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

+2 −2

Original line number	Diff line number	Diff line
		@@ -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

+2 −2

Original line number	Diff line number	Diff line
		@@ -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()
		}