Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16cc1a1f authored by Jacky Wang's avatar Jacky Wang
Browse files

[Catalyst] Rename PreferenceScreenMetadata{Creator,Factory} 

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

src/com/android/settings/SettingsApplication.java

+5 −5
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ import com.android.settings.spa.SettingsSpaEnvironment; 
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 @@ public class SettingsApplication extends Application { 
        super.onCreate();



        if (Flags.catalyst()) {

            PreferenceScreenRegistry.INSTANCE.setPreferenceScreenMetadataCreators(

                    getPreferenceScreenCreators());

            PreferenceScreenRegistry.INSTANCE.setPreferenceScreenMetadataFactories(

                    preferenceScreenFactories());

            PreferenceBindingFactory.setDefaultFactory(new SettingsPreferenceBindingFactory());

        }
@@ -106,8 +106,8 @@ public class SettingsApplication extends Application { 
        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();