am 132ad329: am 306c1cf2: Show widgets when ALL_APPS is disabled. (01e377b0) · Commits · e / os / BlissLauncher3

src/com/android/launcher3/Launcher.java

+8 −4

Original line number	Diff line number	Diff line
		@@ -2908,8 +2908,9 @@ public class Launcher extends Activity
		// Shrink workspaces away if going to AppsCustomize from workspace
		Animator workspaceAnim =
		mWorkspace.getChangeStateAnimation(Workspace.State.SMALL, animated);
		if (!AppsCustomizePagedView.DISABLE_ALL_APPS) {
		// Set the content type for the all apps space
		if (!AppsCustomizePagedView.DISABLE_ALL_APPS
		\|\| contentType == AppsCustomizePagedView.ContentType.Widgets) {
		// Set the content type for the all apps/widgets space
		mAppsCustomizeTabHost.setContentTypeImmediate(contentType);
		}

		@@ -4053,6 +4054,10 @@ public class Launcher extends Activity
		}
		mIntentsOnWorkspaceFromUpgradePath = null;
		}
		if (mAppsCustomizeContent != null) {
		mAppsCustomizeContent.onPackagesUpdated(
		LauncherModel.getSortedWidgetsAndShortcuts(this));
		}
		} else {
		if (mAppsCustomizeContent != null) {
		mAppsCustomizeContent.setApps(apps);
		@@ -4141,8 +4146,7 @@ public class Launcher extends Activity
		}

		// Update the widgets pane
		if (!AppsCustomizePagedView.DISABLE_ALL_APPS &&
		mAppsCustomizeContent != null) {
		if (mAppsCustomizeContent != null) {
		mAppsCustomizeContent.onPackagesUpdated(widgetsAndShortcuts);
		}
		}