summaryrefslogtreecommitdiffstats
path: root/core/java/android/text/method
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2010-09-26 22:20:12 -0700
committerJeff Brown <jeffbrown@google.com>2010-09-26 22:20:12 -0700
commit01ce2e9eee41cc0c24b0d16465710a28ea337d5d (patch)
tree08e45a8ec47e63760655a1770dac367258511538 /core/java/android/text/method
parent37cedce14bc0e68e8bf27c2cecb181728226e6ed (diff)
downloadframeworks_base-01ce2e9eee41cc0c24b0d16465710a28ea337d5d.zip
frameworks_base-01ce2e9eee41cc0c24b0d16465710a28ea337d5d.tar.gz
frameworks_base-01ce2e9eee41cc0c24b0d16465710a28ea337d5d.tar.bz2
Add suuport for splitting touch events across windows.
This feature is currently used to enable dragging the start and end selection handles of a TextView at the same time. Could be used for other things later. Deleted some dead code in ArrowKeyMovementMethod and CursorControllers. Change-Id: I930accd97ca1ca1917aab8a807db2c950fc7b409
Diffstat (limited to 'core/java/android/text/method')
-rw-r--r--core/java/android/text/method/ArrowKeyMovementMethod.java61
1 files changed, 0 insertions, 61 deletions
diff --git a/core/java/android/text/method/ArrowKeyMovementMethod.java b/core/java/android/text/method/ArrowKeyMovementMethod.java
index 733b535..220e023 100644
--- a/core/java/android/text/method/ArrowKeyMovementMethod.java
+++ b/core/java/android/text/method/ArrowKeyMovementMethod.java
@@ -23,19 +23,12 @@ import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.View;
import android.widget.TextView;
-import android.widget.TextView.CursorController;
// XXX this doesn't extend MetaKeyKeyListener because the signatures
// don't match. Need to figure that out. Meanwhile the meta keys
// won't work in fields that don't take input.
public class ArrowKeyMovementMethod implements MovementMethod {
- /**
- * An optional controller for the cursor.
- * Use {@link #setCursorController(CursorController)} to set this field.
- */
- private CursorController mCursorController;
-
private boolean isCap(Spannable buffer) {
return ((MetaKeyKeyListener.getMetaState(buffer, KeyEvent.META_SHIFT_ON) == 1) ||
(MetaKeyKeyListener.getMetaState(buffer, MetaKeyKeyListener.META_SELECTING) != 0));
@@ -192,21 +185,10 @@ public class ArrowKeyMovementMethod implements MovementMethod {
}
public boolean onTrackballEvent(TextView widget, Spannable text, MotionEvent event) {
- if (mCursorController != null) {
- mCursorController.hide();
- }
return false;
}
public boolean onTouchEvent(TextView widget, Spannable buffer, MotionEvent event) {
- if (mCursorController != null) {
- return onTouchEventCursor(widget, buffer, event);
- } else {
- return onTouchEventStandard(widget, buffer, event);
- }
- }
-
- private boolean onTouchEventStandard(TextView widget, Spannable buffer, MotionEvent event) {
int initialScrollX = -1, initialScrollY = -1;
if (event.getAction() == MotionEvent.ACTION_UP) {
initialScrollX = Touch.getInitialScrollX(widget, buffer);
@@ -278,49 +260,6 @@ public class ArrowKeyMovementMethod implements MovementMethod {
return handled;
}
- private boolean onTouchEventCursor(TextView widget, Spannable buffer, MotionEvent event) {
- if (widget.isFocused() && !widget.didTouchFocusSelect()) {
- switch (event.getActionMasked()) {
- case MotionEvent.ACTION_MOVE:
- widget.cancelLongPress();
-
- // Offset the current touch position (from controller to cursor)
- final float x = event.getX() + mCursorController.getOffsetX();
- final float y = event.getY() + mCursorController.getOffsetY();
- mCursorController.updatePosition((int) x, (int) y);
- return true;
-
- case MotionEvent.ACTION_UP:
- case MotionEvent.ACTION_CANCEL:
- mCursorController = null;
- return true;
- }
- }
- return false;
- }
-
- /**
- * Defines the cursor controller.
- *
- * When set, this object can be used to handle touch events, that can be translated into cursor
- * updates.
- *
- * {@link MotionEvent#ACTION_MOVE} events will call back the
- * {@link CursorController#updatePosition(int, int)} controller's method, passing the current
- * finger coordinates (offset by {@link CursorController#getOffsetX()} and
- * {@link CursorController#getOffsetY()}) as parameters.
- *
- * When the gesture is finished (on a {@link MotionEvent#ACTION_UP} or
- * {@link MotionEvent#ACTION_CANCEL} event), the controller is reset to null.
- *
- * @param cursorController A cursor controller implementation
- *
- * @hide
- */
- public void setCursorController(CursorController cursorController) {
- mCursorController = cursorController;
- }
-
public boolean canSelectArbitrarily() {
return true;
}