summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNilesh Agrawal <nileshagrawal@google.com>2013-12-12 14:56:00 -0800
committerNilesh Agrawal <nileshagrawal@google.com>2013-12-12 15:00:59 -0800
commit306c1cf200d4e334b19e09a5a5a2026d9f6d12b2 (patch)
treee8bee0fb04b25f329599078db7292a72bfd4fd85
parent33cd5b9e9ecc541f4966a0d285296fb53447fdf4 (diff)
downloadandroid_packages_apps_Trebuchet-306c1cf200d4e334b19e09a5a5a2026d9f6d12b2.zip
android_packages_apps_Trebuchet-306c1cf200d4e334b19e09a5a5a2026d9f6d12b2.tar.gz
android_packages_apps_Trebuchet-306c1cf200d4e334b19e09a5a5a2026d9f6d12b2.tar.bz2
Show widgets when ALL_APPS is disabled.
Change-Id: I367448df69a63ffd3412fe4c99137a21426d285c
-rw-r--r--src/com/android/launcher3/Launcher.java12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 318066b..9485cea 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -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);
}
}