commit 4da294de83f7557f3e479c56c35ce1491c1936dd
author Adam Cohen <adamcohen@google.com> Mon Jul 28 10:56:19 2014 -0700
committer Adam Cohen <adamcohen@google.com> Mon Jul 28 15:07:18 2014 -0700
tree b1454fc198f078d1c0695f8c3b3e4c795311d56c
parent 43f3ca0f8c424415dfa0cd6c269900638da3d21c

Remove 300 ms start delay from app launch transition

-> tiny cleanup from isLmp crunch

issue 16309411

Change-Id: Ib2edff84b53ca471e7d2a2a458091db1fa2f6b42

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 3cbe1c1..a5bf690 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2776,12 +2776,9 @@
 
             Bundle optsBundle = null;
             if (useLaunchAnimation) {
-                ActivityOptions opts = ActivityOptions.makeScaleUpAnimation(v, 0, 0,
-                        v.getMeasuredWidth(), v.getMeasuredHeight());
-                optsBundle = opts.toBundle();
-            }
-            if (useLaunchAnimation && Utilities.isLmp()) {
-                ActivityOptions opts = ActivityOptions.makeCustomAnimation(this, R.anim.task_open_enter, R.anim.no_anim);
+                ActivityOptions opts = Utilities.isLmp() ?
+                        ActivityOptions.makeCustomAnimation(this, R.anim.task_open_enter, R.anim.no_anim) :
+                        ActivityOptions.makeScaleUpAnimation(v, 0, 0, v.getMeasuredWidth(), v.getMeasuredHeight());
                 optsBundle = opts.toBundle();
             }