From 7ce9985d37e253a93617404d5991017e1ea81907 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Thu, 24 May 2012 17:34:08 -0700 Subject: Fixing issue where multiple widget pages would fail to load correctly, preventing you from adding widgets. (Bug 6556434) Change-Id: I48a8aa51d892aef7036009a608903fe089136d82 --- src/com/android/launcher2/AppsCustomizePagedView.java | 6 ++++++ src/com/android/launcher2/PendingAddItemInfo.java | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java index 67def1794..03d2a72e5 100644 --- a/src/com/android/launcher2/AppsCustomizePagedView.java +++ b/src/com/android/launcher2/AppsCustomizePagedView.java @@ -974,6 +974,12 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen task.cancel(false); iter.remove(); mDirtyPageContent.set(task.page, true); + + // We've already preallocated the views for the data to load into, so clear them as well + View v = getPageAt(task.page); + if (v instanceof PagedViewGridLayout) { + ((PagedViewGridLayout) v).removeAllViewsOnPage(); + } } mDeferredSyncWidgetPageItems.clear(); } diff --git a/src/com/android/launcher2/PendingAddItemInfo.java b/src/com/android/launcher2/PendingAddItemInfo.java index eaa2e4ddb..9a133ed27 100644 --- a/src/com/android/launcher2/PendingAddItemInfo.java +++ b/src/com/android/launcher2/PendingAddItemInfo.java @@ -39,6 +39,11 @@ class PendingAddShortcutInfo extends PendingAddItemInfo { public PendingAddShortcutInfo(ActivityInfo activityInfo) { shortcutActivityInfo = activityInfo; } + + @Override + public String toString() { + return "Shortcut: " + shortcutActivityInfo.packageName; + } } class PendingAddWidgetInfo extends PendingAddItemInfo { @@ -91,4 +96,9 @@ class PendingAddWidgetInfo extends PendingAddItemInfo { minSpanX = copy.minSpanX; minSpanY = copy.minSpanY; } + + @Override + public String toString() { + return "Widget: " + componentName.toShortString(); + } } -- cgit v1.2.3