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

[Catalyst] Rename PreferenceScreenMetadata{Creator,Factory}

Browse Source 
Bug: 386179791
Flag: com.android.settings.flags.catalyst
Test: manual
Change-Id: Id932b2555bd72f3635ad1a866c866b5d5535ce86
This commit is contained in:
Jacky Wang
2024-12-31 21:59:16 +08:00
parent 99c5bf8b2c
commit 16cc1a1f24
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/SettingsApplication.java
View File

@@ -44,7 +44,7 @@ import com.android.settings.spa.SettingsSpaEnvironment;
import com.android.settingslib.applications.AppIconCacheManager; import com.android.settingslib.applications.AppIconCacheManager;
import com.android.settingslib.datastore.BackupRestoreStorageManager; import com.android.settingslib.datastore.BackupRestoreStorageManager;
import com.android.settingslib.metadata.FixedArrayMap; 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.PreferenceScreenRegistry;
import com.android.settingslib.metadata.ProvidePreferenceScreenOptions; import com.android.settingslib.metadata.ProvidePreferenceScreenOptions;
import com.android.settingslib.preference.PreferenceBindingFactory; import com.android.settingslib.preference.PreferenceBindingFactory;
@@ -75,8 +75,8 @@ public class SettingsApplication extends Application {
super.onCreate(); super.onCreate();
if (Flags.catalyst()) { if (Flags.catalyst()) {
PreferenceScreenRegistry.INSTANCE.setPreferenceScreenMetadataCreators( PreferenceScreenRegistry.INSTANCE.setPreferenceScreenMetadataFactories(
getPreferenceScreenCreators()); preferenceScreenFactories());
PreferenceBindingFactory.setDefaultFactory(new SettingsPreferenceBindingFactory()); PreferenceBindingFactory.setDefaultFactory(new SettingsPreferenceBindingFactory());
} }
@@ -106,8 +106,8 @@ public class SettingsApplication extends Application {
registerActivityLifecycleCallbacks(new DeveloperOptionsActivityLifecycle()); registerActivityLifecycleCallbacks(new DeveloperOptionsActivityLifecycle());
} }
/** Returns the creators of preference screen metadata. */ /** Returns the factories of preference screen metadata. */
protected FixedArrayMap<String, PreferenceScreenMetadataCreator> getPreferenceScreenCreators() { protected FixedArrayMap<String, PreferenceScreenMetadataFactory> preferenceScreenFactories() {
// PreferenceScreenCollector is generated by annotation processor from classes annotated // PreferenceScreenCollector is generated by annotation processor from classes annotated
// with @ProvidePreferenceScreen // with @ProvidePreferenceScreen
return PreferenceScreenCollector.get(); return PreferenceScreenCollector.get();