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

Merge "[wm]: Fixed TaskPositioner leak" into qt-dev

Browse Source 
am: 050d6df74c

Change-Id: Ife9c5d5da6fae4d40183a6a56a71165001bf6674
This commit is contained in:
yj81.kwon
2019-05-20 04:54:49 -07:00
committed by android-build-merger
parent 29d9b1d9b2 050d6df74c
commit b2f088409b
7 changed files with 69 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/com/android/internal/widget/DecorCaptionView.java
View File

@@ -188,7 +188,8 @@ public class DecorCaptionView extends ViewGroup implements View.OnTouchListener,
final int y = (int) e.getY();
final boolean fromMouse = e.getToolType(e.getActionIndex()) == MotionEvent.TOOL_TYPE_MOUSE;
final boolean primaryButton = (e.getButtonState() & MotionEvent.BUTTON_PRIMARY) != 0;
switch (e.getActionMasked()) {
final int actionMasked = e.getActionMasked();
switch (actionMasked) {
case MotionEvent.ACTION_DOWN:
if (!mShow) {
// When there is no caption we should not react to anything.
@@ -220,6 +221,12 @@ public class DecorCaptionView extends ViewGroup implements View.OnTouchListener,
break;
}
// Abort the ongoing dragging.
if (actionMasked == MotionEvent.ACTION_UP) {
// If it receives ACTION_UP event, the dragging is already finished and also
// the system can not end drag on ACTION_UP event. So request to finish
// dragging.
finishMovingTask();
}
mDragging = false;
return !mCheckForDragging;
}