diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2019-01-31 12:37:41 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2019-01-31 13:19:49 -0800 |
commit | 9018627d055e86dd8f15a6f2c9f0c1ed6bf3efe6 (patch) | |
tree | 3197343f858a69d2b993dc30a13d05640bf32072 | |
parent | 9d8f5bfe0103ea2bcd20c9f68e5cc29752afb452 (diff) | |
download | android_packages_apps_Trebuchet-9018627d055e86dd8f15a6f2c9f0c1ed6bf3efe6.tar.gz android_packages_apps_Trebuchet-9018627d055e86dd8f15a6f2c9f0c1ed6bf3efe6.tar.bz2 android_packages_apps_Trebuchet-9018627d055e86dd8f15a6f2c9f0c1ed6bf3efe6.zip |
Removing disable launch animation flag
The flag is no longer enforced as it applied to legacy shourtcuts only
and was meant for jelly bean devices
Change-Id: I4b143c42fc7d64584421b35457e02059b0022802
-rw-r--r-- | src/com/android/launcher3/BaseDraggingActivity.java | 13 | ||||
-rw-r--r-- | src/com/android/launcher3/views/OptionsPopupView.java | 7 |
2 files changed, 2 insertions, 18 deletions
diff --git a/src/com/android/launcher3/BaseDraggingActivity.java b/src/com/android/launcher3/BaseDraggingActivity.java index 5b9b172e7..ff9dd131b 100644 --- a/src/com/android/launcher3/BaseDraggingActivity.java +++ b/src/com/android/launcher3/BaseDraggingActivity.java @@ -44,10 +44,6 @@ public abstract class BaseDraggingActivity extends BaseActivity private static final String TAG = "BaseDraggingActivity"; - // The Intent extra that defines whether to ignore the launch animation - public static final String INTENT_EXTRA_IGNORE_LAUNCH_ANIMATION = - "com.android.launcher3.intent.extra.shortcut.INGORE_LAUNCH_ANIMATION"; - // When starting an action mode, setting this tag will cause the action mode to be cancelled // automatically when user interacts with the launcher. public static final Object AUTO_CANCEL_ACTION_MODE = new Object(); @@ -158,14 +154,7 @@ public abstract class BaseDraggingActivity extends BaseActivity return false; } - // Only launch using the new animation if the shortcut has not opted out (this is a - // private contract between launcher and may be ignored in the future). - boolean useLaunchAnimation = (v != null) && - !intent.hasExtra(INTENT_EXTRA_IGNORE_LAUNCH_ANIMATION); - Bundle optsBundle = useLaunchAnimation - ? getActivityLaunchOptionsAsBundle(v) - : null; - + Bundle optsBundle = (v != null) ? getActivityLaunchOptionsAsBundle(v) : null; UserHandle user = item == null ? null : item.user; // Prepare intent diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java index 6ba2f4069..71bf7810d 100644 --- a/src/com/android/launcher3/views/OptionsPopupView.java +++ b/src/com/android/launcher3/views/OptionsPopupView.java @@ -15,7 +15,6 @@ */ package com.android.launcher3.views; -import static com.android.launcher3.BaseDraggingActivity.INTENT_EXTRA_IGNORE_LAUNCH_ANIMATION; import static com.android.launcher3.Utilities.EXTRA_WALLPAPER_OFFSET; import android.content.Context; @@ -195,16 +194,12 @@ public class OptionsPopupView extends ArrowPopup return false; } Intent intent = new Intent(Intent.ACTION_SET_WALLPAPER) + .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK) .putExtra(EXTRA_WALLPAPER_OFFSET, launcher.getWorkspace().getWallpaperOffsetForCenterPage()); - intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); - String pickerPackage = launcher.getString(R.string.wallpaper_picker_package); if (!TextUtils.isEmpty(pickerPackage)) { intent.setPackage(pickerPackage); - } else { - // If there is no target package, use the default intent chooser animation - intent.putExtra(INTENT_EXTRA_IGNORE_LAUNCH_ANIMATION, true); } return launcher.startActivitySafely(v, intent, null); } |