resolved conflicts for merge of 68fdeaad to ub-launcher3-burnaby

Change-Id: I29aa5b37968b1ced81cdeb68a021db9310047252
2015-04-06 13:11:28 -07:00
parent b5352011e6
commit 2e52c90b3f
4 changed files with 3 additions and 70 deletions
@@ -2958,14 +2958,11 @@ public class Launcher extends Activity
                        sClipRevealMethod = null;
                    }
                }
-                if (opts == null) {
-                    opts = Utilities.isLmpOrAbove() ?
-                            ActivityOptions.makeCustomAnimation(this,
-                                    R.anim.task_open_enter, R.anim.no_anim) :
-                            ActivityOptions.makeScaleUpAnimation(v, 0, 0,
+                if (opts == null && !Utilities.isLmpOrAbove()) {
+                    opts = ActivityOptions.makeScaleUpAnimation(v, 0, 0,
                                    v.getMeasuredWidth(), v.getMeasuredHeight());
                }
-                optsBundle = opts.toBundle();
+                optsBundle = opts != null ? opts.toBundle() : null;
            }

            if (user == null || user.equals(UserHandleCompat.myUserHandle())) {