diff options
author | Winson Chung <winsonc@google.com> | 2011-08-24 13:47:51 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-24 13:47:51 -0700 |
commit | efad83059881d20ff97ec277581d54492bae6213 (patch) | |
tree | a0a128f8b97d0033589a395ee5bbc76edb6b8079 | |
parent | 36cf2c7651ee9eb5e3721eef7239738ff34cdf71 (diff) | |
parent | 87acb4806bc921297384183a5d69eec28cd35f6e (diff) | |
download | packages_apps_trebuchet-efad83059881d20ff97ec277581d54492bae6213.zip packages_apps_trebuchet-efad83059881d20ff97ec277581d54492bae6213.tar.gz packages_apps_trebuchet-efad83059881d20ff97ec277581d54492bae6213.tar.bz2 |
Merge "Fixing issue where rotating device while in widgets pane fails to load."
-rw-r--r-- | src/com/android/launcher2/AppsCustomizePagedView.java | 8 | ||||
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java index 949d872..0e442ea 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) { diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 2fade8f..262ed93 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -1061,6 +1061,8 @@ public final class Launcher extends Activity void closeSystemDialogs() { getWindow().closeAllPanels(); + /** + * We should remove this code when we remove all the dialog code. try { dismissDialog(DIALOG_CREATE_SHORTCUT); // Unlock the workspace if the dialog was showing @@ -1074,6 +1076,7 @@ public final class Launcher extends Activity } catch (Exception e) { // An exception is thrown if the dialog is not visible, which is fine } + */ // Whatever we were doing is hereby canceled. mWaitingForResult = false; |