Show widgets when ALL_APPS is disabled.

Change-Id: I367448df69a63ffd3412fe4c99137a21426d285c
This commit is contained in:
Nilesh Agrawal
2013-12-12 14:56:00 -08:00
parent 33cd5b9e9e
commit 306c1cf200
+8 -4
View File
@@ -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);
}
}