diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2017-12-05 15:11:21 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2017-12-06 10:34:16 -0800 |
commit | 7ede6118b774d288849e3e637bbd9f1c149034e4 (patch) | |
tree | 30103a2e2eaff8e0be0eb250f2abe951ce8a42fc /src/com/android/launcher3/dragndrop/DragLayer.java | |
parent | 7d6b4fa47cbbb2e0c0dd8bdc01f2d0d61fb1dad4 (diff) | |
download | packages_apps_Trebuchet-7ede6118b774d288849e3e637bbd9f1c149034e4.tar.gz packages_apps_Trebuchet-7ede6118b774d288849e3e637bbd9f1c149034e4.tar.bz2 packages_apps_Trebuchet-7ede6118b774d288849e3e637bbd9f1c149034e4.zip |
Moving discovery bounce logic to a separate class.
Removing special transition handling around discovery bound to avoid
inconsistant UI state
Change-Id: Ia40bcb0719076021a6c96f1bd16d44da0286a209
Diffstat (limited to 'src/com/android/launcher3/dragndrop/DragLayer.java')
-rw-r--r-- | src/com/android/launcher3/dragndrop/DragLayer.java | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java index 9f9822c4c..cf76e2ec9 100644 --- a/src/com/android/launcher3/dragndrop/DragLayer.java +++ b/src/com/android/launcher3/dragndrop/DragLayer.java @@ -45,7 +45,6 @@ import com.android.launcher3.Launcher; import com.android.launcher3.R; import com.android.launcher3.ShortcutAndWidgetContainer; import com.android.launcher3.Utilities; -import com.android.launcher3.allapps.AllAppsTransitionController; import com.android.launcher3.anim.Interpolators; import com.android.launcher3.folder.Folder; import com.android.launcher3.folder.FolderIcon; @@ -90,9 +89,6 @@ public class DragLayer extends InsettableFrameLayout { private final ViewGroupFocusHelper mFocusIndicatorHelper; private final PageCutOutScrimDrawable mPageCutOutScrim; - // Handles all apps pull up interaction - private AllAppsTransitionController mAllAppsController; - protected TouchController[] mControllers; private TouchController mActiveController; /** @@ -113,11 +109,9 @@ public class DragLayer extends InsettableFrameLayout { mPageCutOutScrim.setCallback(this); } - public void setup(Launcher launcher, DragController dragController, - AllAppsTransitionController allAppsTransitionController) { + public void setup(Launcher launcher, DragController dragController) { mLauncher = launcher; mDragController = dragController; - mAllAppsController = allAppsTransitionController; mControllers = UiFactory.createTouchControllers(mLauncher); } @@ -156,12 +150,7 @@ public class DragLayer extends InsettableFrameLayout { public boolean onInterceptTouchEvent(MotionEvent ev) { 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(); - } else if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) { + if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) { if (mTouchCompleteListener != null) { mTouchCompleteListener.onTouchComplete(); } @@ -800,6 +789,6 @@ public class DragLayer extends InsettableFrameLayout { } public interface TouchCompleteListener { - public void onTouchComplete(); + void onTouchComplete(); } } |