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

am 9a08fe2a: Merge "Update button press in AbsListView to use new MotionEvent APIs" into mnc-dev

Browse Source 
* commit '9a08fe2aca44f190162b198a726bc406ed19c1c7':
  Update button press in AbsListView to use new MotionEvent APIs
This commit is contained in:
Mady Mellor
2015-06-18 15:55:06 +00:00
committed by Android Git Automerger
parent a4e0fca089 9a08fe2aca
commit 0bbabc031a
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/java/android/widget/AbsListView.java
View File

@@ -3113,9 +3113,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
} }
private boolean performStylusButtonPressAction(MotionEvent ev) { private boolean performStylusButtonPressAction(MotionEvent ev) {
if (ev.getToolType(0) == MotionEvent.TOOL_TYPE_STYLUS if (mChoiceMode == CHOICE_MODE_MULTIPLE_MODAL && mChoiceActionMode == null) {
&& ev.isButtonPressed(MotionEvent.BUTTON_SECONDARY)
&& mChoiceMode == CHOICE_MODE_MULTIPLE_MODAL && mChoiceActionMode == null) {
final View child = getChildAt(mMotionPosition - mFirstPosition); final View child = getChildAt(mMotionPosition - mFirstPosition);
if (child != null) { if (child != null) {
final int longPressPosition = mMotionPosition; final int longPressPosition = mMotionPosition;
@@ -3785,7 +3783,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
} }
if (mTouchMode == TOUCH_MODE_DOWN && mMotionPosition != INVALID_POSITION if (mTouchMode == TOUCH_MODE_DOWN && mMotionPosition != INVALID_POSITION
&& (performButtonActionOnTouchDown(ev) || performStylusButtonPressAction(ev))) { && performButtonActionOnTouchDown(ev)) {
removeCallbacks(mPendingCheckForTap); removeCallbacks(mPendingCheckForTap);
} }
} }
@@ -3828,11 +3826,6 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
mTouchMode = TOUCH_MODE_DONE_WAITING; mTouchMode = TOUCH_MODE_DONE_WAITING;
updateSelectorState(); updateSelectorState();
} else if (motionView != null) { } else if (motionView != null) {
if (performStylusButtonPressAction(ev)) {
removeCallbacks(mPendingCheckForTap);
removeCallbacks(mPendingCheckForLongPress);
}
// Still within bounds, update the hotspot. // Still within bounds, update the hotspot.
final float[] point = mTmpPoint; final float[] point = mTmpPoint;
point[0] = x; point[0] = x;
@@ -4072,7 +4065,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
public boolean onGenericMotionEvent(MotionEvent event) { public boolean onGenericMotionEvent(MotionEvent event) {
if ((event.getSource() & InputDevice.SOURCE_CLASS_POINTER) != 0) { if ((event.getSource() & InputDevice.SOURCE_CLASS_POINTER) != 0) {
switch (event.getAction()) { switch (event.getAction()) {
case MotionEvent.ACTION_SCROLL: { case MotionEvent.ACTION_SCROLL:
if (mTouchMode == TOUCH_MODE_REST) { if (mTouchMode == TOUCH_MODE_REST) {
final float vscroll = event.getAxisValue(MotionEvent.AXIS_VSCROLL); final float vscroll = event.getAxisValue(MotionEvent.AXIS_VSCROLL);
if (vscroll != 0) { if (vscroll != 0) {
@@ -4082,9 +4075,22 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
} }
} }
} }
} break;
case MotionEvent.ACTION_BUTTON_PRESS:
int actionButton = event.getActionButton();
if ((actionButton == MotionEvent.BUTTON_STYLUS_PRIMARY
|| actionButton == MotionEvent.BUTTON_SECONDARY)
&& (mTouchMode == TOUCH_MODE_DOWN || mTouchMode == TOUCH_MODE_TAP)) {
if (performStylusButtonPressAction(event)) {
removeCallbacks(mPendingCheckForLongPress);
removeCallbacks(mPendingCheckForTap);
}
}
break;
} }
} }
return super.onGenericMotionEvent(event); return super.onGenericMotionEvent(event);
} }