summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/Launcher.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-08-24 13:47:51 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-24 13:47:51 -0700
commitefad83059881d20ff97ec277581d54492bae6213 (patch)
treea0a128f8b97d0033589a395ee5bbc76edb6b8079 /src/com/android/launcher2/Launcher.java
parent36cf2c7651ee9eb5e3721eef7239738ff34cdf71 (diff)
parent87acb4806bc921297384183a5d69eec28cd35f6e (diff)
downloadpackages_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."
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
-rw-r--r--src/com/android/launcher2/Launcher.java3
1 files changed, 3 insertions, 0 deletions
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;