Skip to content

Commit 245b453

Browse files
author
Jim Miller
committed
Properly handle cancel event in GlowPadView
There was a workaround used in a previous release where we effectively ignored cancel events to work around another bug. This change removes the workaround and GlowPadView correctly handles the event. Bug 6903638 Change-Id: I9b510985c6da346a4e10cf2535267c8d5efa5871
1 parent b883116 commit 245b453

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

core/java/com/android/internal/widget/multiwaveview/GlowPadView.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -803,12 +803,8 @@ private void handleUp(MotionEvent event) {
803803
private void handleCancel(MotionEvent event) {
804804
if (DEBUG && mDragging) Log.v(TAG, "** Handle CANCEL");
805805

806-
// We should drop the active target here but it interferes with
807-
// moving off the screen in the direction of the navigation bar. At some point we may
808-
// want to revisit how we handle this. For now we'll allow a canceled event to
809-
// activate the current target.
810-
811-
// mActiveTarget = -1; // Drop the active target if canceled.
806+
// Drop the active target if canceled.
807+
mActiveTarget = -1;
812808

813809
int actionIndex = event.findPointerIndex(mPointerId);
814810
actionIndex = actionIndex == -1 ? 0 : actionIndex;

0 commit comments

Comments
 (0)