Skip to content

Commit 138363e

Browse files
Michael WrightThe Android Automerger
authored andcommitted
DO NOT MERGE Remove Pointer Capture API.
Bug: 26830970 Change-Id: I14d8facef79710eb5397cff83ddde348a39f5c5f
1 parent cdb04cc commit 138363e

File tree

1 file changed

+4
-44
lines changed

1 file changed

+4
-44
lines changed

samples/ApiDemos/src/com/example/android/apis/graphics/TouchRotateActivity.java

Lines changed: 4 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -79,65 +79,25 @@ public TouchSurfaceView(Context context) {
7979
setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY);
8080
}
8181

82-
@Override
83-
public boolean onKeyDown(int keyCode, KeyEvent event) {
84-
// Release pointer capture on any key press.
85-
if (event.getAction() == KeyEvent.ACTION_DOWN && hasPointerCapture()) {
86-
releasePointerCapture();
87-
}
88-
return super.onKeyDown(keyCode, event);
89-
}
90-
9182
@Override public boolean onTrackballEvent(MotionEvent e) {
9283
mRenderer.mAngleX += e.getX() * TRACKBALL_SCALE_FACTOR;
9384
mRenderer.mAngleY += e.getY() * TRACKBALL_SCALE_FACTOR;
9485
requestRender();
9586
return true;
9687
}
9788

98-
@Override public boolean onHoverEvent(MotionEvent e) {
99-
if (hasPointerCapture()) {
100-
switch (e.getAction()) {
101-
case MotionEvent.ACTION_HOVER_MOVE:
102-
case MotionEvent.ACTION_HOVER_EXIT:
103-
case MotionEvent.ACTION_HOVER_ENTER:
104-
updateAngles(e);
105-
break;
106-
}
107-
}
108-
return super.onHoverEvent(e);
109-
}
110-
11189
@Override public boolean onTouchEvent(MotionEvent e) {
112-
switch (e.getAction()) {
113-
case MotionEvent.ACTION_DOWN:
114-
if (e.isFromSource(InputDevice.SOURCE_MOUSE)) {
115-
if (hasPointerCapture()) {
116-
releasePointerCapture();
117-
} else {
118-
requestPointerCapture();
119-
}
120-
}
121-
break;
122-
123-
case MotionEvent.ACTION_MOVE:
124-
updateAngles(e);
125-
break;
90+
if (e.getActionMasked() == MotionEvent.ACTION_MOVE) {
91+
updateAngles(e);
12692
}
12793
mPreviousX = e.getX();
12894
mPreviousY = e.getY();
12995
return true;
13096
}
13197

13298
private void updateAngles(MotionEvent e) {
133-
float dx, dy;
134-
if (e.isFromSource(InputDevice.SOURCE_MOUSE) && hasPointerCapture()) {
135-
dx = e.getAxisValue(MotionEvent.AXIS_RELATIVE_X);
136-
dy = e.getAxisValue(MotionEvent.AXIS_RELATIVE_Y);
137-
} else {
138-
dx = e.getX() - mPreviousX;
139-
dy = e.getY() - mPreviousY;
140-
}
99+
float dx = e.getX() - mPreviousX;
100+
float dy = e.getY() - mPreviousY;
141101
if (dx != 0 && dy != 0) {
142102
mRenderer.mAngleX += dx * TOUCH_SCALE_FACTOR;
143103
mRenderer.mAngleY += dy * TOUCH_SCALE_FACTOR;

0 commit comments

Comments
 (0)