Merge "Fixing issue where rotating device while in widgets pane fails to load."
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 @@
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 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 @@
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 @@
} 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;