diff options
author | Michael Wright <michaelwr@google.com> | 2016-05-16 16:17:02 +0100 |
---|---|---|
committer | The Android Automerger <android-build@google.com> | 2016-05-26 16:26:05 -0700 |
commit | 138363ea639cae1255992bd4c93db89222bba367 (patch) | |
tree | 89dedb7ed870c5e10ee32e1edcf5e4516e8fff0e | |
parent | cdb04cc41670972deda1f38bffb7dac20c04b7c3 (diff) | |
download | android_development-138363ea639cae1255992bd4c93db89222bba367.tar.gz android_development-138363ea639cae1255992bd4c93db89222bba367.tar.bz2 android_development-138363ea639cae1255992bd4c93db89222bba367.zip |
DO NOT MERGE Remove Pointer Capture API.
Bug: 26830970
Change-Id: I14d8facef79710eb5397cff83ddde348a39f5c5f
-rw-r--r-- | samples/ApiDemos/src/com/example/android/apis/graphics/TouchRotateActivity.java | 48 |
1 files changed, 4 insertions, 44 deletions
diff --git a/samples/ApiDemos/src/com/example/android/apis/graphics/TouchRotateActivity.java b/samples/ApiDemos/src/com/example/android/apis/graphics/TouchRotateActivity.java index cea1d662c..e8da8deff 100644 --- a/samples/ApiDemos/src/com/example/android/apis/graphics/TouchRotateActivity.java +++ b/samples/ApiDemos/src/com/example/android/apis/graphics/TouchRotateActivity.java @@ -79,15 +79,6 @@ class TouchSurfaceView extends GLSurfaceView { setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY); } - @Override - public boolean onKeyDown(int keyCode, KeyEvent event) { - // Release pointer capture on any key press. - if (event.getAction() == KeyEvent.ACTION_DOWN && hasPointerCapture()) { - releasePointerCapture(); - } - return super.onKeyDown(keyCode, event); - } - @Override public boolean onTrackballEvent(MotionEvent e) { mRenderer.mAngleX += e.getX() * TRACKBALL_SCALE_FACTOR; mRenderer.mAngleY += e.getY() * TRACKBALL_SCALE_FACTOR; @@ -95,34 +86,9 @@ class TouchSurfaceView extends GLSurfaceView { return true; } - @Override public boolean onHoverEvent(MotionEvent e) { - if (hasPointerCapture()) { - switch (e.getAction()) { - case MotionEvent.ACTION_HOVER_MOVE: - case MotionEvent.ACTION_HOVER_EXIT: - case MotionEvent.ACTION_HOVER_ENTER: - updateAngles(e); - break; - } - } - return super.onHoverEvent(e); - } - @Override public boolean onTouchEvent(MotionEvent e) { - switch (e.getAction()) { - case MotionEvent.ACTION_DOWN: - if (e.isFromSource(InputDevice.SOURCE_MOUSE)) { - if (hasPointerCapture()) { - releasePointerCapture(); - } else { - requestPointerCapture(); - } - } - break; - - case MotionEvent.ACTION_MOVE: - updateAngles(e); - break; + if (e.getActionMasked() == MotionEvent.ACTION_MOVE) { + updateAngles(e); } mPreviousX = e.getX(); mPreviousY = e.getY(); @@ -130,14 +96,8 @@ class TouchSurfaceView extends GLSurfaceView { } private void updateAngles(MotionEvent e) { - float dx, dy; - if (e.isFromSource(InputDevice.SOURCE_MOUSE) && hasPointerCapture()) { - dx = e.getAxisValue(MotionEvent.AXIS_RELATIVE_X); - dy = e.getAxisValue(MotionEvent.AXIS_RELATIVE_Y); - } else { - dx = e.getX() - mPreviousX; - dy = e.getY() - mPreviousY; - } + float dx = e.getX() - mPreviousX; + float dy = e.getY() - mPreviousY; if (dx != 0 && dy != 0) { mRenderer.mAngleX += dx * TOUCH_SCALE_FACTOR; mRenderer.mAngleY += dy * TOUCH_SCALE_FACTOR; |