openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Not opening all apps again when AppInfo or Uninstall is selected" into ub-now-queens

This commit is contained in:
Adam Cohen 2014-10-21 18:11:34 +00:00 committed by Android (Google) Code Review
parent 1aa3abea27 8498eb40ee
commit e75e7ab4fd
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/launcher3/AppsCustomizePagedView.java
View File

@ -728,7 +728,8 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
!(target instanceof DeleteDropTarget) && !(target instanceof Folder))) { !(target instanceof DeleteDropTarget) && !(target instanceof Folder))) {
// Exit spring loaded mode if we have not successfully dropped or have not handled the // Exit spring loaded mode if we have not successfully dropped or have not handled the
// drop in Workspace // drop in Workspace
mLauncher.exitSpringLoadedDragMode(); mLauncher.exitSpringLoadedDragModeDelayed(true,
Launcher.EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT, null);
mLauncher.unlockScreenOrientation(false); mLauncher.unlockScreenOrientation(false);
} else { } else {
mLauncher.unlockScreenOrientation(false); mLauncher.unlockScreenOrientation(false);

8
src/com/android/launcher3/DeleteDropTarget.java
View File

@ -21,8 +21,6 @@ import android.animation.ValueAnimator;
import android.animation.ValueAnimator.AnimatorUpdateListener; import android.animation.ValueAnimator.AnimatorUpdateListener;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent;
import android.content.pm.ResolveInfo;
import android.content.res.ColorStateList; import android.content.res.ColorStateList;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.content.res.Resources; import android.content.res.Resources;
@ -41,12 +39,8 @@ import android.view.animation.AnimationUtils;
import android.view.animation.DecelerateInterpolator; import android.view.animation.DecelerateInterpolator;
import android.view.animation.LinearInterpolator; import android.view.animation.LinearInterpolator;
import com.android.launcher3.compat.LauncherAppsCompat;
import com.android.launcher3.compat.UserHandleCompat; import com.android.launcher3.compat.UserHandleCompat;
import java.util.List;
import java.util.Set;
public class DeleteDropTarget extends ButtonDropTarget { public class DeleteDropTarget extends ButtonDropTarget {
private static int DELETE_ANIMATION_DURATION = 285; private static int DELETE_ANIMATION_DURATION = 285;
private static int FLING_DELETE_ANIMATION_DURATION = 350; private static int FLING_DELETE_ANIMATION_DURATION = 350;
@ -266,7 +260,7 @@ public class DeleteDropTarget extends ButtonDropTarget {
public void run() { public void run() {
completeDrop(d); completeDrop(d);
mSearchDropTargetBar.onDragEnd(); mSearchDropTargetBar.onDragEnd();
mLauncher.exitSpringLoadedDragMode(); mLauncher.exitSpringLoadedDragModeDelayed(true, 0, null);
} }
}; };
dragLayer.animateView(d.dragView, from, to, scale, 1f, 1f, 0.1f, 0.1f, dragLayer.animateView(d.dragView, from, to, scale, 1f, 1f, 0.1f, 0.1f,