diff options
| author | Winson Chung <winsonc@google.com> | 2011-08-23 17:28:05 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2011-08-23 18:05:20 -0700 |
| commit | 87acb4806bc921297384183a5d69eec28cd35f6e (patch) | |
| tree | cfe9dfc5a9edd1658879812b8931f15b31e97312 /src/com/android/launcher2/AppsCustomizePagedView.java | |
| parent | 0b48076529aa3710a2d9e35ae1cb391f77d897ae (diff) | |
| download | android_packages_apps_Trebuchet-87acb4806bc921297384183a5d69eec28cd35f6e.tar.gz android_packages_apps_Trebuchet-87acb4806bc921297384183a5d69eec28cd35f6e.tar.bz2 android_packages_apps_Trebuchet-87acb4806bc921297384183a5d69eec28cd35f6e.zip | |
Fixing issue where rotating device while in widgets pane fails to load.
- Removed some unnecessary code related to dialogs.
Change-Id: I5abfc7851c78e6597fd49cc96db5b26bd0976c1c
Diffstat (limited to 'src/com/android/launcher2/AppsCustomizePagedView.java')
| -rw-r--r-- | src/com/android/launcher2/AppsCustomizePagedView.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java index 949d87266..0e442eaeb 100644 --- a/src/com/android/launcher2/AppsCustomizePagedView.java +++ b/src/com/android/launcher2/AppsCustomizePagedView.java @@ -315,7 +315,11 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen private boolean testDataReady() { // We only do this test once, and we default to the Applications page, so we only really // have to wait for there to be apps. - return !mApps.isEmpty(); + if (mContentType == AppsCustomizePagedView.ContentType.Widgets) { + return !mApps.isEmpty() && !mWidgets.isEmpty(); + } else { + return !mApps.isEmpty(); + } } /** Restores the page for an item at the specified index */ @@ -574,7 +578,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen public void setContentType(ContentType type) { mContentType = type; - invalidatePageData(0, true); + invalidatePageData(0, (type != ContentType.Applications)); } public boolean isContentType(ContentType type) { |