Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update DesktopModeTouchEventListener to correctly identify click events." into tm-qpr-dev

Browse Source
This commit is contained in:
Matt Sziklay
2023-02-15 17:04:35 +00:00
committed by Android (Google) Code Review
parent 3800ea7c67 b45e67c06c
commit 2b9c9c231a
2 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java
View File

@@ -250,25 +250,30 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel {
@Override @Override
public boolean onTouch(View v, MotionEvent e) { public boolean onTouch(View v, MotionEvent e) {
boolean isDrag = false;
final int id = v.getId(); final int id = v.getId();
if (id != R.id.caption_handle && id != R.id.desktop_mode_caption) { if (id != R.id.caption_handle && id != R.id.desktop_mode_caption) {
return false; return false;
} }
if (id == R.id.caption_handle) { switch (e.getAction()) {
isDrag = mDragDetector.onMotionEvent(e); case MotionEvent.ACTION_DOWN:
mDragDetector.onMotionEvent(e);
final RunningTaskInfo taskInfo = mTaskOrganizer.getRunningTaskInfo(mTaskId);
if (taskInfo.isFocused) {
return mDragDetector.isDragEvent();
}
final WindowContainerTransaction wct = new WindowContainerTransaction();
wct.reorder(mTaskToken, true /* onTop */);
mSyncQueue.queue(wct);
return false;
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_CANCEL:
boolean res = mDragDetector.isDragEvent();
mDragDetector.onMotionEvent(e);
return res;
default:
mDragDetector.onMotionEvent(e);
return mDragDetector.isDragEvent();
} }
if (e.getAction() != MotionEvent.ACTION_DOWN) {
return isDrag;
}
final RunningTaskInfo taskInfo = mTaskOrganizer.getRunningTaskInfo(mTaskId);
if (taskInfo.isFocused) {
return isDrag;
}
final WindowContainerTransaction wct = new WindowContainerTransaction();
wct.reorder(mTaskToken, true /* onTop */);
mSyncQueue.queue(wct);
return true;
} }
/** /**

4
libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragDetector.java
View File

@@ -94,6 +94,10 @@ class DragDetector {
mTouchSlop = touchSlop; mTouchSlop = touchSlop;
} }
boolean isDragEvent() {
return mIsDragEvent;
}
private void resetState() { private void resetState() {
mIsDragEvent = false; mIsDragEvent = false;
mInputDownPoint.set(0, 0); mInputDownPoint.set(0, 0);