diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-04-09 19:03:02 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-09 19:03:02 +0000 |
commit | 563178b173c281f7dc382c4c3337f3721c576815 (patch) | |
tree | 7819da6ff167e2e2df106868c7232decdb33c65c /src | |
parent | 5e29395eba591d181de8150b91d79328eaf550d4 (diff) | |
parent | d158097cfdcda346080071d33d2e565e18c74a5f (diff) | |
download | android_packages_apps_Trebuchet-563178b173c281f7dc382c4c3337f3721c576815.tar.gz android_packages_apps_Trebuchet-563178b173c281f7dc382c4c3337f3721c576815.tar.bz2 android_packages_apps_Trebuchet-563178b173c281f7dc382c4c3337f3721c576815.zip |
Merge "Do a full touch dispach when proxying touch" into ub-launcher3-qt-dev
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/Hotseat.java | 7 | ||||
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 1 | ||||
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 7 | ||||
-rw-r--r-- | src/com/android/launcher3/views/BaseDragLayer.java | 8 |
4 files changed, 13 insertions, 10 deletions
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java index cbd3fc034..4da7907b2 100644 --- a/src/com/android/launcher3/Hotseat.java +++ b/src/com/android/launcher3/Hotseat.java @@ -20,6 +20,7 @@ import android.content.Context; import android.graphics.Rect; import android.util.AttributeSet; import android.view.Gravity; +import android.view.MotionEvent; import android.view.View; import android.view.ViewDebug; import android.view.ViewGroup; @@ -98,4 +99,10 @@ public class Hotseat extends CellLayout implements LogContainerProvider, Insetta setLayoutParams(lp); InsettableFrameLayout.dispatchInsets(this, insets); } + + @Override + public boolean onTouchEvent(MotionEvent event) { + // Don't let if follow through to workspace + return true; + } } diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index f8d99595e..c14512a7e 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -974,7 +974,6 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, mDropTargetBar.setup(mDragController); mAllAppsController.setupViews(mAppsView); - mHotseat.setOnInterceptTouchListener(mWorkspace::onInterceptHotseatTouch); } /** diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index d24a5a619..2ee537cfc 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -475,13 +475,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator> super.onViewAdded(child); } - protected boolean onInterceptHotseatTouch(View v, MotionEvent ev) { - // We don't want any clicks to go through to the hotseat unless the workspace is in - // the normal state or an accessible drag is in progress. - return !workspaceIconsCanBeDragged() - && !mLauncher.getAccessibilityDelegate().isInAccessibleDrag(); - } - /** * Initializes and binds the first page * @param qsb an existing qsb to recycle or null. diff --git a/src/com/android/launcher3/views/BaseDragLayer.java b/src/com/android/launcher3/views/BaseDragLayer.java index bd6bfd685..ab72bbe18 100644 --- a/src/com/android/launcher3/views/BaseDragLayer.java +++ b/src/com/android/launcher3/views/BaseDragLayer.java @@ -223,14 +223,18 @@ public abstract class BaseDragLayer<T extends Context & ActivityContext> @Override public boolean dispatchTouchEvent(MotionEvent ev) { - return verifyTouchDispatch(this, ev) && super.dispatchTouchEvent(ev); + return dispatchTouchEvent(this, ev); + } + + public boolean dispatchTouchEvent(Object caller, MotionEvent ev) { + return verifyTouchDispatch(caller, ev) && super.dispatchTouchEvent(ev); } /** * Returns true if the {@param caller} is allowed to dispatch {@param ev} on this view, * false otherwise. */ - public boolean verifyTouchDispatch(Object caller, MotionEvent ev) { + private boolean verifyTouchDispatch(Object caller, MotionEvent ev) { int action = ev.getAction(); if (action == ACTION_DOWN) { if (mCurrentTouchOwner != null) { |