diff options
| author | Adam Cohen <adamcohen@google.com> | 2015-04-06 13:11:28 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2015-04-06 13:11:38 -0700 |
| commit | 2e52c90b3ff0a04bd734aa19c54c39cef186b653 (patch) | |
| tree | 3f1417cdd5fd40f79d1e630e6483dd528763ea94 /src/com/android/launcher3 | |
| parent | b5352011e6e890769454ab3335d88f5b3f19d498 (diff) | |
| download | android_packages_apps_Trebuchet-2e52c90b3ff0a04bd734aa19c54c39cef186b653.tar.gz android_packages_apps_Trebuchet-2e52c90b3ff0a04bd734aa19c54c39cef186b653.tar.bz2 android_packages_apps_Trebuchet-2e52c90b3ff0a04bd734aa19c54c39cef186b653.zip | |
resolved conflicts for merge of 68fdeaad to ub-launcher3-burnaby
Change-Id: I29aa5b37968b1ced81cdeb68a021db9310047252
Diffstat (limited to 'src/com/android/launcher3')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index c040d93f2..2fa2f4ad7 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -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())) { |