diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2016-07-22 00:33:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-07-22 00:33:13 +0000 |
| commit | 7122cb8e2b0e6fed791c94e9e64ba70e16e9094d (patch) | |
| tree | cac380fbcf03a2d7815ba176ae0af0d2a18d4913 /src/com/android/launcher3/dragndrop/DragLayer.java | |
| parent | 9d6df217af2f54754fc21483d437b3dda0395d9d (diff) | |
| parent | c001cf562017d08cd48b67de8f377ca08881e70e (diff) | |
| download | android_packages_apps_Trebuchet-7122cb8e2b0e6fed791c94e9e64ba70e16e9094d.tar.gz android_packages_apps_Trebuchet-7122cb8e2b0e6fed791c94e9e64ba70e16e9094d.tar.bz2 android_packages_apps_Trebuchet-7122cb8e2b0e6fed791c94e9e64ba70e16e9094d.zip | |
Merge "Animate discovery bounce for all apps pull up interaction b/30221381" into ub-launcher3-calgary
Diffstat (limited to 'src/com/android/launcher3/dragndrop/DragLayer.java')
| -rw-r--r-- | src/com/android/launcher3/dragndrop/DragLayer.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java index 5f8faab3d..28b6f3ead 100644 --- a/src/com/android/launcher3/dragndrop/DragLayer.java +++ b/src/com/android/launcher3/dragndrop/DragLayer.java @@ -280,6 +280,10 @@ public class DragLayer extends InsettableFrameLayout { int action = ev.getAction(); if (action == MotionEvent.ACTION_DOWN) { + // Cancel discovery bounce animation when a user start interacting on anywhere on + // dray layer even if mAllAppsController is NOT the active controller. + // TODO: handle other input other than touch + mAllAppsController.cancelDiscoveryAnimation(); if (handleTouchDown(ev, true)) { return true; } |