commit 16cc1a1f24fd3493a626fd6e9a5365d445833c14
author Jacky Wang <jiannan@google.com> Tue Dec 31 21:59:16 2024 +0800
committer Jacky Wang <jiannan@google.com> Thu Jan 02 10:11:26 2025 +0800
tree 0320ed80972c387f8d765a153b1ac3e696607310
parent 99c5bf8b2c0d0ecf38eae0c5462be5a229527770

[Catalyst] Rename PreferenceScreenMetadata{Creator,Factory}

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

src/com/android/settings/SettingsApplication.java

diff --git a/src/com/android/settings/SettingsApplication.java b/src/com/android/settings/SettingsApplication.java
index f2257d4..442e3c2 100644
--- a/src/com/android/settings/SettingsApplication.java
+++ b/src/com/android/settings/SettingsApplication.java
@@ -44,7 +44,7 @@
 import com.android.settingslib.applications.AppIconCacheManager;
 import com.android.settingslib.datastore.BackupRestoreStorageManager;
 import com.android.settingslib.metadata.FixedArrayMap;
-import com.android.settingslib.metadata.PreferenceScreenMetadataCreator;
+import com.android.settingslib.metadata.PreferenceScreenMetadataFactory;
 import com.android.settingslib.metadata.PreferenceScreenRegistry;
 import com.android.settingslib.metadata.ProvidePreferenceScreenOptions;
 import com.android.settingslib.preference.PreferenceBindingFactory;
@@ -75,8 +75,8 @@
         super.onCreate();
 
         if (Flags.catalyst()) {
-            PreferenceScreenRegistry.INSTANCE.setPreferenceScreenMetadataCreators(
-                    getPreferenceScreenCreators());
+            PreferenceScreenRegistry.INSTANCE.setPreferenceScreenMetadataFactories(
+                    preferenceScreenFactories());
             PreferenceBindingFactory.setDefaultFactory(new SettingsPreferenceBindingFactory());
         }
 
@@ -106,8 +106,8 @@
         registerActivityLifecycleCallbacks(new DeveloperOptionsActivityLifecycle());
     }
 
-    /** Returns the creators of preference screen metadata. */
-    protected FixedArrayMap<String, PreferenceScreenMetadataCreator> getPreferenceScreenCreators() {
+    /** Returns the factories of preference screen metadata. */
+    protected FixedArrayMap<String, PreferenceScreenMetadataFactory> preferenceScreenFactories() {
         // PreferenceScreenCollector is generated by annotation processor from classes annotated
         // with @ProvidePreferenceScreen
         return PreferenceScreenCollector.get();