summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2014-06-11 18:57:39 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-11 18:57:39 +0000
commit76308c3b6222d98e4dbc0fbabd21ad9b57f27e88 (patch)
tree8ed11d9905783bdbad8f65c75ff9776eef558c42 /src
parent128d1c8e1d0a2bcdbe1d58e62c9d60deb5424e1b (diff)
parent6ea3b116fc2eea7cc1a6892c548da45a4f581a1d (diff)
downloadandroid_packages_apps_Trebuchet-76308c3b6222d98e4dbc0fbabd21ad9b57f27e88.tar.gz
android_packages_apps_Trebuchet-76308c3b6222d98e4dbc0fbabd21ad9b57f27e88.tar.bz2
android_packages_apps_Trebuchet-76308c3b6222d98e4dbc0fbabd21ad9b57f27e88.zip
am 6ea3b116: Override app launch transition for LMP preview
* commit '6ea3b116fc2eea7cc1a6892c548da45a4f581a1d': Override app launch transition for LMP preview
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/Launcher.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index e5a17c0d7..60efcea6d 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2744,6 +2744,10 @@ public class Launcher extends Activity
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);
+ optsBundle = opts.toBundle();
+ }
if (user == null || user.equals(UserHandleCompat.myUserHandle())) {
// Could be launching some bookkeeping activity