[DO NOT MERGE] Use custom slide-up animation on LMP MR1 instead of system default
issue 21402755
Change-Id: I87ddef08e7b3134c791f769fc279e62d520cd18c
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 2fc3b75..48f3901 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2943,10 +2943,15 @@
Bundle optsBundle = null;
if (useLaunchAnimation && !Utilities.isLmpOrAbove()) {
// On pre-L devices, we use the scale up transition.
- // Otherwise we use system default.
ActivityOptions opts =
ActivityOptions.makeScaleUpAnimation(v, 0, 0, v.getMeasuredWidth(), v.getMeasuredHeight());
optsBundle = opts.toBundle();
+ } else if (useLaunchAnimation && Utilities.isLmpMr1()) {
+ // On L-MR1 devices, we use custom slide up animation without a delay
+ // On L devices, we use the system default slide up.
+ ActivityOptions opts = ActivityOptions.makeCustomAnimation(this,
+ R.anim.task_open_enter, R.anim.no_anim);
+ optsBundle = opts.toBundle();
}
if (user == null || user.equals(UserHandleCompat.myUserHandle())) {