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

Merge "A long press on the selection handle no longer selects the word." into honeycomb

Browse Source
This commit is contained in:
Gilles Debunne
2011-01-25 15:59:01 -08:00
committed by Android (Google) Code Review
parent 5c4c0d50fc 874d77c62e
commit 4df103cf3d
1 changed files with 39 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
core/java/android/widget/TextView.java
View File

@@ -8596,7 +8596,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
private long mTouchTimer;
private boolean mIsInsertionHandle = false;
private PastePopupMenu mPastePopupWindow;
private Runnable mLongPressCallback;
// Touch-up filter: number of previous positions remembered
private static final int HISTORY_SIZE = 5;
@@ -8839,73 +8838,49 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
@Override
public boolean onTouchEvent(MotionEvent ev) {
switch (ev.getActionMasked()) {
case MotionEvent.ACTION_DOWN: {
startTouchUpFilter(mController.getCurrentOffset(this));
mDownPositionX = ev.getRawX();
mDownPositionY = ev.getRawY();
mTouchToWindowOffsetX = mDownPositionX - mPositionX;
mTouchToWindowOffsetY = mDownPositionY - mPositionY;
final int[] coords = mTempCoords;
TextView.this.getLocationInWindow(coords);
mLastParentX = coords[0];
mLastParentY = coords[1];
mIsDragging = true;
if (mIsInsertionHandle) {
mTouchTimer = SystemClock.uptimeMillis();
if (mLongPressCallback == null) {
mLongPressCallback = new Runnable() {
public void run() {
mController.hide();
startSelectionActionMode();
case MotionEvent.ACTION_DOWN: {
startTouchUpFilter(mController.getCurrentOffset(this));
mDownPositionX = ev.getRawX();
mDownPositionY = ev.getRawY();
mTouchToWindowOffsetX = mDownPositionX - mPositionX;
mTouchToWindowOffsetY = mDownPositionY - mPositionY;
final int[] coords = mTempCoords;
TextView.this.getLocationInWindow(coords);
mLastParentX = coords[0];
mLastParentY = coords[1];
mIsDragging = true;
break;
}
case MotionEvent.ACTION_MOVE: {
final float rawX = ev.getRawX();
final float rawY = ev.getRawY();
final float newPosX = rawX - mTouchToWindowOffsetX + mHotspotX;
final float newPosY = rawY - mTouchToWindowOffsetY + mHotspotY + mTouchOffsetY;
mController.updatePosition(this, Math.round(newPosX), Math.round(newPosY));
break;
}
case MotionEvent.ACTION_UP:
if (mIsInsertionHandle) {
long delay = SystemClock.uptimeMillis() - mTouchTimer;
if (delay < ViewConfiguration.getTapTimeout()) {
if (mPastePopupWindow != null && mPastePopupWindow.isShowing()) {
// Tapping on the handle dismisses the displayed paste view,
mPastePopupWindow.hide();
} else {
((InsertionPointCursorController) mController).show(0);
}
};
}
postDelayed(mLongPressCallback, ViewConfiguration.getLongPressTimeout());
}
break;
}
case MotionEvent.ACTION_MOVE: {
final float rawX = ev.getRawX();
final float rawY = ev.getRawY();
final float newPosX = rawX - mTouchToWindowOffsetX + mHotspotX;
final float newPosY = rawY - mTouchToWindowOffsetY + mHotspotY + mTouchOffsetY;
mController.updatePosition(this, Math.round(newPosX), Math.round(newPosY));
if (mIsInsertionHandle) {
final float dx = rawX - mDownPositionX;
final float dy = rawY - mDownPositionY;
final float distanceSquared = dx * dx + dy * dy;
if (distanceSquared >= mSquaredTouchSlopDistance) {
removeLongPressCallback();
}
}
break;
}
case MotionEvent.ACTION_UP:
if (mIsInsertionHandle) {
removeLongPressCallback();
long delay = SystemClock.uptimeMillis() - mTouchTimer;
if (delay < ViewConfiguration.getTapTimeout()) {
if (mPastePopupWindow != null && mPastePopupWindow.isShowing()) {
// Tapping on the handle dismisses the displayed paste view,
mPastePopupWindow.hide();
} else {
((InsertionPointCursorController) mController).show(0);
}
}
}
filterOnTouchUp();
mIsDragging = false;
break;
filterOnTouchUp();
mIsDragging = false;
break;
case MotionEvent.ACTION_CANCEL:
if (mIsInsertionHandle) {
removeLongPressCallback();
}
mIsDragging = false;
case MotionEvent.ACTION_CANCEL:
mIsDragging = false;
break;
}
return true;
}
@@ -8943,16 +8918,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
mPastePopupWindow.show();
}
}
private void removeLongPressCallback() {
if (mLongPressCallback != null) {
removeCallbacks(mLongPressCallback);
}
}
void onDetached() {
removeLongPressCallback();
}
}
private class InsertionPointCursorController implements CursorController {
@@ -9079,9 +9044,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
public void onDetached() {
removeHiderCallback();
removePastePopupCallback();
if (mHandle != null) {
mHandle.onDetached();
}
}
}