commit 00afa11c1565da7ad6721db08a4da7c2ec1eacc0
author Gilles Debunne <debunne@google.com> Fri Jun 03 10:32:00 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 03 10:32:00 2011 -0700
tree cd72671cc934c077fe99c6a2afbac8fb7400ec8c
parent c22d145a9f26314e23ea678e96766755268e878b
parent 0538e6217de35e418c9779fd48c8300e65cc4f1e

am 0538e621: Merge "Tap timeout removed on paste. Relying on position only." into honeycomb-mr2

* commit '0538e6217de35e418c9779fd48c8300e65cc4f1e':
  Tap timeout removed on paste. Relying on position only.

core/java/android/widget/TextView.java

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 13b9285f..435cf4e 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -5236,6 +5236,7 @@
      * @param text The auto complete text the user has selected.
      */
     public void onCommitCompletion(CompletionInfo text) {
+        // Intentionally empty
     }
 
     /**
@@ -8660,8 +8661,6 @@
         private boolean mIsActive = false;
         // The insertion handle can have an associated PastePopupMenu
         private boolean mIsInsertionHandle = false;
-        // Used to detect taps on the insertion handle, which will affect the PastePopupMenu
-        private long mTouchTimer;
         private PastePopupMenu mPastePopupWindow;
 
         // Touch-up filter: number of previous positions remembered
@@ -8932,9 +8931,6 @@
                     mLastParentX = coords[0];
                     mLastParentY = coords[1];
                     mIsDragging = true;
-                    if (mIsInsertionHandle) {
-                        mTouchTimer = SystemClock.uptimeMillis();
-                    }
                     break;
                 }
 
@@ -8964,18 +8960,15 @@
 
                 case MotionEvent.ACTION_UP:
                     if (mIsInsertionHandle) {
-                        long delay = SystemClock.uptimeMillis() - mTouchTimer;
-                        if (delay < ViewConfiguration.getTapTimeout()) {
-                            final float deltaX = mDownPositionX - ev.getRawX();
-                            final float deltaY = mDownPositionY - ev.getRawY();
-                            final float distanceSquared = deltaX * deltaX + deltaY * deltaY;
-                            if (distanceSquared < mSquaredTouchSlopDistance) {
-                                if (mPastePopupWindow != null && mPastePopupWindow.isShowing()) {
-                                    // Tapping on the handle dismisses the displayed paste view,
-                                    mPastePopupWindow.hide();
-                                } else {
-                                    ((InsertionPointCursorController) mController).show(0);
-                                }
+                        final float deltaX = mDownPositionX - ev.getRawX();
+                        final float deltaY = mDownPositionY - ev.getRawY();
+                        final float distanceSquared = deltaX * deltaX + deltaY * deltaY;
+                        if (distanceSquared < mSquaredTouchSlopDistance) {
+                            if (mPastePopupWindow != null && mPastePopupWindow.isShowing()) {
+                                // Tapping on the handle dismisses the displayed paste view,
+                                mPastePopupWindow.hide();
+                            } else {
+                                ((InsertionPointCursorController) mController).show(0);
                             }
                         }
                     }
@@ -9360,7 +9353,9 @@
         }
 
         @Override
-        public void onDetached() {}
+        public void onDetached() {
+            // Nothing to do
+        }
     }
 
     private void hideInsertionPointCursorController() {