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 "Fix bug where workspace taps were not being sent to WallpaperManager." into ub-launcher3-edmonton

This commit is contained in:
TreeHugger Robot 2018-04-24 22:41:33 +00:00 committed by Android (Google) Code Review
parent 38cbf7e97a d2d39cbfc7
commit ad007ba9f1
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/launcher3/Workspace.java
View File

@ -477,7 +477,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
super.onViewAdded(child); super.onViewAdded(child);
} }
boolean isTouchActive() { public boolean isTouchActive() {
return mTouchState != TOUCH_STATE_REST; return mTouchState != TOUCH_STATE_REST;
} }
@ -974,19 +974,9 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
@Override @Override
public boolean onInterceptTouchEvent(MotionEvent ev) { public boolean onInterceptTouchEvent(MotionEvent ev) {
switch (ev.getAction() & MotionEvent.ACTION_MASK) { if (ev.getActionMasked() == MotionEvent.ACTION_DOWN) {
case MotionEvent.ACTION_DOWN:
mXDown = ev.getX(); mXDown = ev.getX();
mYDown = ev.getY(); mYDown = ev.getY();
break;
case MotionEvent.ACTION_POINTER_UP:
case MotionEvent.ACTION_UP:
if (mTouchState == TOUCH_STATE_REST) {
final CellLayout currentPage = (CellLayout) getChildAt(mCurrentPage);
if (currentPage != null) {
onWallpaperTap(ev);
}
}
} }
return super.onInterceptTouchEvent(ev); return super.onInterceptTouchEvent(ev);
} }
@ -1443,7 +1433,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
} }
} }
protected void onWallpaperTap(MotionEvent ev) { public void onWallpaperTap(MotionEvent ev) {
final int[] position = mTempXY; final int[] position = mTempXY;
getLocationOnScreen(position); getLocationOnScreen(position);

13
src/com/android/launcher3/touch/WorkspaceTouchListener.java
View File

@ -17,6 +17,7 @@ package com.android.launcher3.touch;
import static android.view.MotionEvent.ACTION_CANCEL; import static android.view.MotionEvent.ACTION_CANCEL;
import static android.view.MotionEvent.ACTION_DOWN; import static android.view.MotionEvent.ACTION_DOWN;
import static android.view.MotionEvent.ACTION_POINTER_UP;
import static android.view.MotionEvent.ACTION_UP; import static android.view.MotionEvent.ACTION_UP;
import static android.view.ViewConfiguration.getLongPressTimeout; import static android.view.ViewConfiguration.getLongPressTimeout;
@ -30,6 +31,7 @@ import android.view.View;
import android.view.View.OnTouchListener; import android.view.View.OnTouchListener;
import com.android.launcher3.AbstractFloatingView; import com.android.launcher3.AbstractFloatingView;
import com.android.launcher3.CellLayout;
import com.android.launcher3.DeviceProfile; import com.android.launcher3.DeviceProfile;
import com.android.launcher3.Launcher; import com.android.launcher3.Launcher;
import com.android.launcher3.Workspace; import com.android.launcher3.Workspace;
@ -121,6 +123,17 @@ public class WorkspaceTouchListener implements OnTouchListener, Runnable {
// We don't want to handle touch, let workspace handle it as usual. // We don't want to handle touch, let workspace handle it as usual.
result = false; result = false;
} }
if (action == ACTION_UP || action == ACTION_POINTER_UP) {
if (!mWorkspace.isTouchActive()) {
final CellLayout currentPage =
(CellLayout) mWorkspace.getChildAt(mWorkspace.getCurrentPage());
if (currentPage != null) {
mWorkspace.onWallpaperTap(ev);
}
}
}
if (action == ACTION_UP || action == ACTION_CANCEL) { if (action == ACTION_UP || action == ACTION_CANCEL) {
cancelLongPress(); cancelLongPress();
} }