diff options
author | Winson Chung <winsonc@google.com> | 2012-04-12 10:59:27 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2012-04-12 10:59:49 -0700 |
commit | 318eee06ae69ac5ef8fddde984eb2f7601d2101d (patch) | |
tree | b5dfc58dfb50de8f34e64245ffbd73f97f8a4a90 | |
parent | 2c2b28ae557f83b3d114afeedb61c546a503eb99 (diff) | |
download | android_packages_apps_Trebuchet-318eee06ae69ac5ef8fddde984eb2f7601d2101d.tar.gz android_packages_apps_Trebuchet-318eee06ae69ac5ef8fddde984eb2f7601d2101d.tar.bz2 android_packages_apps_Trebuchet-318eee06ae69ac5ef8fddde984eb2f7601d2101d.zip |
Addressing issues with comments in previous new-app animation delay change.
Change-Id: I1185ae890c5374f9b736c567622372b54fbde0ed
-rw-r--r-- | src/com/android/launcher2/DragController.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java index 59dcc5bff..f2db48726 100644 --- a/src/com/android/launcher2/DragController.java +++ b/src/com/android/launcher2/DragController.java @@ -111,6 +111,7 @@ public class DragController { private InputMethodManager mInputMethodManager; private int mLastTouch[] = new int[2]; + private long mLastTouchUpTime = -1; private int mDistanceSinceScroll = 0; private int mTmpPoint[] = new int[2]; @@ -440,7 +441,6 @@ public class DragController { return mTmpPoint; } - private long mLastTouchUpTime = -1; long getLastGestureUpTime() { if (mDragging) { return System.currentTimeMillis(); diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index f768a3965..d451ad2fd 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -3288,7 +3288,7 @@ public final class Launcher extends Activity runNewAppsAnimation(false); } } else { - // If the user has interacted recently, then run the animations immediately if they + // If the user has interacted recently, then just add the items in place if they // are on another page (or just normally if they are added to the current page) runNewAppsAnimation(willSnapPage); } |