diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2014-10-16 12:08:41 -0700 |
---|---|---|
committer | Danesh M <daneshm90@gmail.com> | 2015-09-27 15:51:41 -0700 |
commit | dc81d701ac61384ab2ab9226cd546475e992368e (patch) | |
tree | 232f244f3de956daf79526404b3baca3340fa2b7 /src | |
parent | 4e4f8a775170fc282ea129a266075522057d29e1 (diff) | |
download | android_packages_apps_Trebuchet-dc81d701ac61384ab2ab9226cd546475e992368e.tar.gz android_packages_apps_Trebuchet-dc81d701ac61384ab2ab9226cd546475e992368e.tar.bz2 android_packages_apps_Trebuchet-dc81d701ac61384ab2ab9226cd546475e992368e.zip |
Not opening all apps again when AppInfo or Uninstall is selected
Bug: 17460202
Change-Id: Id67a9637324abceb5b446fff5999db2a0910401b
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/AppsCustomizePagedView.java | 3 | ||||
-rw-r--r-- | src/com/android/launcher3/DeleteDropTarget.java | 8 |
2 files changed, 3 insertions, 8 deletions
diff --git a/src/com/android/launcher3/AppsCustomizePagedView.java b/src/com/android/launcher3/AppsCustomizePagedView.java index 33c90a3ad..5af1179aa 100644 --- a/src/com/android/launcher3/AppsCustomizePagedView.java +++ b/src/com/android/launcher3/AppsCustomizePagedView.java @@ -872,7 +872,8 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen !(target instanceof DeleteDropTarget) && !(target instanceof Folder))) { // Exit spring loaded mode if we have not successfully dropped or have not handled the // drop in Workspace - mLauncher.exitSpringLoadedDragMode(); + mLauncher.exitSpringLoadedDragModeDelayed(true, + Launcher.EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT, null); mLauncher.unlockScreenOrientation(false); } else { mLauncher.unlockScreenOrientation(false); diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java index 05e8906cb..ea058ea71 100644 --- a/src/com/android/launcher3/DeleteDropTarget.java +++ b/src/com/android/launcher3/DeleteDropTarget.java @@ -21,8 +21,6 @@ import android.animation.ValueAnimator; import android.animation.ValueAnimator.AnimatorUpdateListener; import android.content.ComponentName; import android.content.Context; -import android.content.Intent; -import android.content.pm.ResolveInfo; import android.content.res.ColorStateList; import android.content.res.Configuration; import android.content.res.Resources; @@ -41,12 +39,8 @@ import android.view.animation.AnimationUtils; import android.view.animation.DecelerateInterpolator; import android.view.animation.LinearInterpolator; -import com.android.launcher3.compat.LauncherAppsCompat; import com.android.launcher3.compat.UserHandleCompat; -import java.util.List; -import java.util.Set; - public class DeleteDropTarget extends ButtonDropTarget { private static int DELETE_ANIMATION_DURATION = 285; private static int FLING_DELETE_ANIMATION_DURATION = 350; @@ -266,7 +260,7 @@ public class DeleteDropTarget extends ButtonDropTarget { public void run() { completeDrop(d); mSearchDropTargetBar.onDragEnd(); - mLauncher.exitSpringLoadedDragMode(); + mLauncher.exitSpringLoadedDragModeDelayed(true, 0, null); } }; dragLayer.animateView(d.dragView, from, to, scale, 1f, 1f, 0.1f, 0.1f, |