Merge "Cleanup ENABLE_BULK_WORKSPACE_ICON_LOADING" into udc-dev (8744d8b6) · Commits · e / os / android_packages_apps_Trebuchet

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

+0 −4

Original line number	Diff line number	Diff line
		@@ -131,10 +131,6 @@ public final class FeatureFlags {
		"ASSISTANT_GIVES_LAUNCHER_FOCUS", DISABLED,
		"Allow Launcher to handle nav bar gestures while Assistant is running over it");

		public static final BooleanFlag ENABLE_BULK_WORKSPACE_ICON_LOADING = getDebugFlag(270392203,
		"ENABLE_BULK_WORKSPACE_ICON_LOADING", ENABLED,
		"Enable loading workspace 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

+13 −15

Original line number	Diff line number	Diff line
		@@ -417,7 +417,7 @@ public class LoaderTask implements Runnable {
		tempPackageKey, widgetHelper, pmHelper, shortcutKeyToPinnedShortcuts,
		iconRequestInfos, unlockedUsers, isSafeMode, allDeepShortcuts);
		}
		maybeLoadWorkspaceIconsInBulk(iconRequestInfos);
		tryLoadWorkspaceIconsInBulk(iconRequestInfos);
		} finally {
		IOUtils.closeSilently(c);
		}
		@@ -598,8 +598,8 @@ public class LoaderTask implements Runnable {
		// Already verified above that user is same as default user
		info = c.getRestoredItemInfo(intent);
		} else if (c.itemType == Favorites.ITEM_TYPE_APPLICATION) {
		info = c.getAppShortcutInfo(intent, allowMissingTarget, useLowResIcon,
		!FeatureFlags.ENABLE_BULK_WORKSPACE_ICON_LOADING.get());
		info = c.getAppShortcutInfo(
		intent, allowMissingTarget, useLowResIcon, false);
		} else if (c.itemType == Favorites.ITEM_TYPE_DEEP_SHORTCUT) {
		ShortcutKey key = ShortcutKey.fromIntent(intent, c.user);
		if (unlockedUsers.get(c.serialNumber)) {
		@@ -861,9 +861,8 @@ public class LoaderTask implements Runnable {
		}
		}

		private void maybeLoadWorkspaceIconsInBulk(
		private void tryLoadWorkspaceIconsInBulk(
		List<IconRequestInfo<WorkspaceItemInfo>> iconRequestInfos) {
		if (FeatureFlags.ENABLE_BULK_WORKSPACE_ICON_LOADING.get()) {
		Trace.beginSection("LoadWorkspaceIconsInBulk");
		try {
		mIconCache.getTitlesAndIconsInBulk(iconRequestInfos);
		@@ -877,7 +876,6 @@ public class LoaderTask implements Runnable {
		Trace.endSection();
		}
		}
		}

		private void setIgnorePackages(IconCacheUpdateHandler updateHandler) {
		// Ignore packages which have a promise icon.