diff options
author | Adam Cohen <adamcohen@google.com> | 2015-07-08 01:59:56 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-08 01:59:57 +0000 |
commit | d98fff30552e7e8cff1205926001cbac7d7e9a35 (patch) | |
tree | 3e71bf5533ae556f5956bf755d4172c873597a07 /src/com/android/launcher3/Launcher.java | |
parent | 3288171507ae38bce261dcf94cfae08392d961c2 (diff) | |
parent | 947e02b638c7947c6c97943041d7153edb7b562e (diff) | |
download | android_packages_apps_Trebuchet-d98fff30552e7e8cff1205926001cbac7d7e9a35.tar.gz android_packages_apps_Trebuchet-d98fff30552e7e8cff1205926001cbac7d7e9a35.tar.bz2 android_packages_apps_Trebuchet-d98fff30552e7e8cff1205926001cbac7d7e9a35.zip |
Merge "Adding custom slide up activity transition for L MR1" into ub-launcher3-burnaby
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 31aab8d1d..55b8f0373 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2899,8 +2899,15 @@ public class Launcher extends Activity } } if (opts == null && !Utilities.isLmpOrAbove()) { + // Below L, we use a scale up animation opts = ActivityOptions.makeScaleUpAnimation(v, 0, 0, v.getMeasuredWidth(), v.getMeasuredHeight()); + } else if (opts == null && Utilities.isLmpMR1()) { + // On L devices, we use the device default slide-up transition. + // On L MR1 devices, we a custom version of the slide-up transition which + // doesn't have the delay present in the device default. + opts = ActivityOptions.makeCustomAnimation(this, + R.anim.task_open_enter, R.anim.no_anim); } optsBundle = opts != null ? opts.toBundle() : null; } |