Skip to content

Commit

Permalink
Merge remote branch 'cm/cm-10.1' into cm-10.1
Browse files Browse the repository at this point in the history
  • Loading branch information
androidarmv6-gerrit committed Dec 28, 2012
2 parents eba875f + 0125dc4 commit 4917e3a
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/com/cyanogenmod/trebuchet/Launcher.java
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,8 @@ private boolean completeAdd(PendingAddArguments args) {
break;
case REQUEST_PICK_SHORTCUT:
processShortcut(args.intent);
break;
// Don't remove pending add info
return false;
case REQUEST_CREATE_SHORTCUT:
completeAddShortcut(args.intent, args.container, args.screen, args.cellX,
args.cellY);
Expand Down

0 comments on commit 4917e3a

Please sign in to comment.