commit 3c396fccd52f9d06b453b655c20c2266dd984d19
author Svetoslav Ganov <svetoslavganov@google.com> Mon Sep 10 17:41:28 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 10 17:41:28 2012 -0700
tree 332741542591b72fe2ae6556f3c395bbd49f069f
parent 4e2eb6581f8ee91166cbfd80b531f628dedab89a
parent 86fe9e14f1a816df32b08e0eb677989cc7444948

Merge "Reducing the click delay while screen magnification is enabled." into jb-mr1-dev

services/java/com/android/server/accessibility/ScreenMagnifier.java

diff --git a/services/java/com/android/server/accessibility/ScreenMagnifier.java b/services/java/com/android/server/accessibility/ScreenMagnifier.java
index ca61400..aa3c82b 100644
--- a/services/java/com/android/server/accessibility/ScreenMagnifier.java
+++ b/services/java/com/android/server/accessibility/ScreenMagnifier.java
@@ -128,6 +128,8 @@
     private static final int DEFAULT_SCREEN_MAGNIFICATION_AUTO_UPDATE = 1;
     private static final float DEFAULT_WINDOW_ANIMATION_SCALE = 1.0f;
 
+    private static final int MULTI_TAP_TIME_SLOP_ADJUSTMENT = 50;
+
     private final IWindowManager mWindowManagerService = IWindowManager.Stub.asInterface(
             ServiceManager.getService("window"));
     private final WindowManager mWindowManager;
@@ -145,7 +147,8 @@
     private final Viewport mViewport;
 
     private final int mTapTimeSlop = ViewConfiguration.getTapTimeout();
-    private final int mMultiTapTimeSlop = ViewConfiguration.getDoubleTapTimeout();
+    private final int mMultiTapTimeSlop =
+            ViewConfiguration.getDoubleTapTimeout() - MULTI_TAP_TIME_SLOP_ADJUSTMENT;
     private final int mTapDistanceSlop;
     private final int mMultiTapDistanceSlop;
 
@@ -617,7 +620,7 @@
                     } else if (mTapCount < ACTION_TAP_COUNT) {
                         Message message = mHandler.obtainMessage(
                                 MESSAGE_TRANSITION_TO_DELEGATING_STATE);
-                        mHandler.sendMessageDelayed(message, mTapTimeSlop + mMultiTapDistanceSlop);
+                        mHandler.sendMessageDelayed(message, mMultiTapTimeSlop);
                     }
                     clearLastDownEvent();
                     mLastDownEvent = MotionEvent.obtain(event);