summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoe Onorato <joeo@android.com>2009-11-08 13:39:30 -0500
committerJoe Onorato <joeo@android.com>2009-11-08 13:39:30 -0500
commite6168662d8ab2fa8026f0b8701cf6c362b3bbd78 (patch)
tree7b32c104a85c6843d527957dc1d71a7fcf92849a /src
parentd753b42d5170ec30172393be538b957b00345d97 (diff)
downloadandroid_packages_apps_Trebuchet-e6168662d8ab2fa8026f0b8701cf6c362b3bbd78.tar.gz
android_packages_apps_Trebuchet-e6168662d8ab2fa8026f0b8701cf6c362b3bbd78.tar.bz2
android_packages_apps_Trebuchet-e6168662d8ab2fa8026f0b8701cf6c362b3bbd78.zip
Fix bug 2242465 - Can add shortcuts while the "3d all apps" is open.
The more I think about it, the more I think AllApps should just be a separate activity. It's not a drawer anymore and you open it by pressing a button. Also, it will want to derive from RenderScriptActivity or something, and have all that stuff dealt with automatically too. It's to late to make a change like this now, but if we do choose to do it someday, I think we'll want to reconsider the menu that's shown. For now, just close all apps when they add a shortcut or change the wallpaper.
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/Launcher.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 41a7fb4c7..2c59b4c81 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1057,6 +1057,7 @@ public final class Launcher extends Activity
}
private void addItems() {
+ closeAllApps(true);
showAddDialog(mMenuAddInfo);
}
@@ -1252,6 +1253,7 @@ public final class Launcher extends Activity
}
private void startWallpaper() {
+ closeAllApps(true);
final Intent pickWallpaper = new Intent(Intent.ACTION_SET_WALLPAPER);
Intent chooser = Intent.createChooser(pickWallpaper,
getText(R.string.chooser_wallpaper));