summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/Launcher.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-08-11 13:42:58 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-11 13:42:58 -0700
commit981b8a3708f7c8de5ab8f896c4ea8110379c012a (patch)
tree80ba75aeef195e721871e9a2000d0f52029d26e5 /src/com/android/launcher2/Launcher.java
parentc57b7a8233d32c6dd8de5057c570afe3f50e3ef2 (diff)
parentc7da555dc5b252042dff0a6920efb1bfeb4a0c9a (diff)
downloadpackages_apps_trebuchet-981b8a3708f7c8de5ab8f896c4ea8110379c012a.zip
packages_apps_trebuchet-981b8a3708f7c8de5ab8f896c4ea8110379c012a.tar.gz
packages_apps_trebuchet-981b8a3708f7c8de5ab8f896c4ea8110379c012a.tar.bz2
Merge "Fixing problems in spring loaded mode and adding shortcut to hotseat. (5144911, 5144663)"
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
-rw-r--r--src/com/android/launcher2/Launcher.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index b1f56d0..0f074ac 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -483,8 +483,7 @@ public final class Launcher extends Activity
// For example, the user would PICK_SHORTCUT for "Music playlist", and we
// launch over to the Music app to actually CREATE_SHORTCUT.
- if (resultCode == RESULT_OK && mPendingAddInfo.container != ItemInfo.NO_ID &&
- mPendingAddInfo.screen > -1) {
+ if (resultCode == RESULT_OK && mPendingAddInfo.container != ItemInfo.NO_ID) {
final PendingAddArguments args = new PendingAddArguments();
args.requestCode = requestCode;
args.intent = data;