diff options
| author | Kenny Root <kroot@google.com> | 2010-08-24 11:48:37 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2010-08-24 11:48:37 -0700 |
| commit | 8db59adccf3e07b9597a69858e8e4de4f7f233e7 (patch) | |
| tree | 790ceca854ae5dc083784a1fe9d0c81b04809999 /core/java/android/text/method | |
| parent | 46089bd1cb031c578735707712cf9574678032fe (diff) | |
| parent | b037da401ad76843c32e7d732d43d452e0e6f978 (diff) | |
| download | frameworks_base-8db59adccf3e07b9597a69858e8e4de4f7f233e7.zip frameworks_base-8db59adccf3e07b9597a69858e8e4de4f7f233e7.tar.gz frameworks_base-8db59adccf3e07b9597a69858e8e4de4f7f233e7.tar.bz2 | |
resolved conflicts for merge of b037da40 to master
Change-Id: I591f80f613870a4b1557f17d1c8574f661ed8121
Diffstat (limited to 'core/java/android/text/method')
| -rw-r--r-- | core/java/android/text/method/ArrowKeyMovementMethod.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/text/method/ArrowKeyMovementMethod.java b/core/java/android/text/method/ArrowKeyMovementMethod.java index 79a0c37..baaf39d 100644 --- a/core/java/android/text/method/ArrowKeyMovementMethod.java +++ b/core/java/android/text/method/ArrowKeyMovementMethod.java @@ -287,8 +287,7 @@ public class ArrowKeyMovementMethod implements MovementMethod { // Offset the current touch position (from controller to cursor) final float x = event.getX() + mCursorController.getOffsetX(); final float y = event.getY() + mCursorController.getOffsetY(); - int offset = widget.getOffset((int) x, (int) y); - mCursorController.updatePosition(offset); + mCursorController.updatePosition((int) x, (int) y); return true; case MotionEvent.ACTION_UP: |