commit 90f4fa52dd4e303919d0f7e0c9c3c429b9d55aab
author Joe Onorato <joeo@android.com> Mon Nov 09 16:26:15 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 09 16:26:15 2009 -0800
tree 332306a51ff743e6b84dfbf1a31baaed1335923a
parent 9f886e19ea5f5f312d52a06ed77218fdaeaefc9d
parent aad5f9e943479e9e6cb5e882bff99decb097a246

am aad5f9e9: am 813071aa: am e6168662: Fix bug 2242465 - Can add shortcuts while the "3d all apps" is open.

Merge commit 'aad5f9e943479e9e6cb5e882bff99decb097a246'

* commit 'aad5f9e943479e9e6cb5e882bff99decb097a246':
  Fix bug 2242465 - Can add shortcuts while the "3d all apps" is open.

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 41a7fb4..2c59b4c 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1057,6 +1057,7 @@
     }
 
     private void addItems() {
+        closeAllApps(true);
         showAddDialog(mMenuAddInfo);
     }
 
@@ -1252,6 +1253,7 @@
     }
 
     private void startWallpaper() {
+        closeAllApps(true);
         final Intent pickWallpaper = new Intent(Intent.ACTION_SET_WALLPAPER);
         Intent chooser = Intent.createChooser(pickWallpaper,
                 getText(R.string.chooser_wallpaper));