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

Commit 4f93cc72 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Cleanup ENABLE_BULK_ALL_APPS_ICON_LOADING" into udc-dev

parents 6a9a1b39 aba2d979

src/com/android/launcher3/config/FeatureFlags.java

+0 −3
Original line number Diff line number Diff line
@@ -143,9 +143,6 @@ public final class FeatureFlags { 
            "ENABLE_BULK_WORKSPACE_ICON_LOADING", ENABLED,

            "Enable loading workspace icons in bulk.");



    public static final BooleanFlag ENABLE_BULK_ALL_APPS_ICON_LOADING = getDebugFlag(270392465,

            "ENABLE_BULK_ALL_APPS_ICON_LOADING", ENABLED, "Enable loading all apps icons in bulk.");



    public static final BooleanFlag ENABLE_DATABASE_RESTORE = getDebugFlag(270392706,

            "ENABLE_DATABASE_RESTORE", DISABLED,

            "Enable database restore when new restore session is created");

src/com/android/launcher3/model/LoaderTask.java

+9 −11
Original line number Diff line number Diff line
@@ -960,7 +960,7 @@ public class LoaderTask implements Runnable { 
                iconRequestInfos.add(new IconRequestInfo<>(

                        appInfo, app, /* useLowResIcon= */ false));

                mBgAllAppsList.add(

                        appInfo, app, !FeatureFlags.ENABLE_BULK_ALL_APPS_ICON_LOADING.get());

                        appInfo, app, false);

            }

            allActivityList.addAll(apps);

        }
@@ -973,7 +973,7 @@ public class LoaderTask implements Runnable { 
                AppInfo promiseAppInfo = mBgAllAppsList.addPromiseApp(

                        mApp.getContext(),

                        PackageInstallInfo.fromInstallingState(info),

                        !FeatureFlags.ENABLE_BULK_ALL_APPS_ICON_LOADING.get());

                        false);



                if (promiseAppInfo != null) {

                    iconRequestInfos.add(new IconRequestInfo<>(
@@ -984,7 +984,6 @@ public class LoaderTask implements Runnable { 
            }

        }



        if (FeatureFlags.ENABLE_BULK_ALL_APPS_ICON_LOADING.get()) {

        Trace.beginSection("LoadAllAppsIconsInBulk");

        try {

            mIconCache.getTitlesAndIconsInBulk(iconRequestInfos);
@@ -993,7 +992,6 @@ public class LoaderTask implements Runnable { 
        } finally {

            Trace.endSection();

        }

        }



        mBgAllAppsList.setFlags(FLAG_QUIET_MODE_ENABLED,

                mUserManagerState.isAnyProfileQuietModeEnabled());