diff options
author | Adam Cohen <adamcohen@google.com> | 2015-04-02 11:53:23 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2015-04-02 11:53:48 -0700 |
commit | 68fdeaadc621b7a9200f5c75790eb756a1983d02 (patch) | |
tree | fda66c357d53c99cf4ef828db8d7b8da0dd5b95d /src | |
parent | 67c3086163593db47e57b8cf4fcb034334374000 (diff) | |
download | android_packages_apps_Trebuchet-68fdeaadc621b7a9200f5c75790eb756a1983d02.tar.gz android_packages_apps_Trebuchet-68fdeaadc621b7a9200f5c75790eb756a1983d02.tar.bz2 android_packages_apps_Trebuchet-68fdeaadc621b7a9200f5c75790eb756a1983d02.zip |
Stop using custom activity transition, rely on system default in these cases
-> workaround for platform issue related to this resource, but also
a decent code cleanup
issue 20006693
Change-Id: Iea3a2fb14be5ed78d882ddf9d970b12d177f4249
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 0414a5b1e..5b8eaef50 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2939,9 +2939,10 @@ public class Launcher extends Activity } Bundle optsBundle = null; - if (useLaunchAnimation) { - ActivityOptions opts = Utilities.isLmpOrAbove() ? - ActivityOptions.makeCustomAnimation(this, R.anim.task_open_enter, R.anim.no_anim) : + 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(); } |