diff options
author | Jon Miranda <jonmiranda@google.com> | 2018-01-18 14:46:34 -0800 |
---|---|---|
committer | Jon Miranda <jonmiranda@google.com> | 2018-01-18 15:13:37 -0800 |
commit | 17940f053de242b25c7364ab330e8fdb60981476 (patch) | |
tree | aa5a265bf7f3d1f892732a3a094066409ed0cdf3 /src_ui_overrides/com/android/launcher3/uioverrides/UiFactory.java | |
parent | 69057173a732add164f83ddc926009c0cdca5e7c (diff) | |
download | android_packages_apps_Trebuchet-17940f053de242b25c7364ab330e8fdb60981476.tar.gz android_packages_apps_Trebuchet-17940f053de242b25c7364ab330e8fdb60981476.tar.bz2 android_packages_apps_Trebuchet-17940f053de242b25c7364ab330e8fdb60981476.zip |
Fallback to old implementation for opening apps in MW mode.
Bug: 70220260
Change-Id: I20aa61357c67e11806823cdfcfbdb76ef773554b
Diffstat (limited to 'src_ui_overrides/com/android/launcher3/uioverrides/UiFactory.java')
-rw-r--r-- | src_ui_overrides/com/android/launcher3/uioverrides/UiFactory.java | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/UiFactory.java b/src_ui_overrides/com/android/launcher3/uioverrides/UiFactory.java index d1b903c83..9819d711a 100644 --- a/src_ui_overrides/com/android/launcher3/uioverrides/UiFactory.java +++ b/src_ui_overrides/com/android/launcher3/uioverrides/UiFactory.java @@ -68,28 +68,6 @@ public class UiFactory { public static void resetOverview(Launcher launcher) { } public static Bundle getActivityLaunchOptions(Launcher launcher, View v) { - if (Utilities.ATLEAST_MARSHMALLOW) { - int left = 0, top = 0; - int width = v.getMeasuredWidth(), height = v.getMeasuredHeight(); - if (v instanceof BubbleTextView) { - // Launch from center of icon, not entire view - Drawable icon = ((BubbleTextView) v).getIcon(); - if (icon != null) { - Rect bounds = icon.getBounds(); - left = (width - bounds.width()) / 2; - top = v.getPaddingTop(); - width = bounds.width(); - height = bounds.height(); - } - } - return ActivityOptions.makeClipRevealAnimation(v, left, top, width, height).toBundle(); - } else if (Utilities.ATLEAST_LOLLIPOP_MR1) { - // On L devices, we use the device default slide-up transition. - // On L MR1 devices, we use a custom version of the slide-up transition which - // doesn't have the delay present in the device default. - return ActivityOptions.makeCustomAnimation( - launcher, R.anim.task_open_enter, R.anim.no_anim).toBundle(); - } - return null; + return launcher.getDefaultActivityLaunchOptions(v); } } |