[Remoting Android] Fix dragging issue in direct input mode

remoting/android/java/src/org/chromium/chromoting/TouchInputHandler.java

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chromoting;
 
 import android.content.Context;
 import android.graphics.Matrix;
 import android.graphics.Point;
 import android.graphics.PointF;
@@ skipping 376 matching lines @@
         if (followCursor) {
             deltaX = -deltaX;
             deltaY = -deltaY;
         }
         // Determine the center point from which to apply the delta.
         // For indirect input modes (i.e. trackpad), the view generally follows the cursor.
         // For direct input modes (i.e. touch) the should track the user's motion.
         // If the user is dragging, then the viewport should always follow the user's finger.
         PointF newPos = mDesktopCanvas.moveViewportCenter(!followCursor, deltaX, deltaY);
 
-        // If we are in an indirect mode or are in the middle of a drag operation, then we want to
-        // keep the cursor centered, if possible, as the viewport moves.
-        if (followCursor) {
+        // If we are in an indirect mode, then we want to keep the cursor centered, if possible, as
+        // the viewport moves.
+        if (mInputStrategy.isIndirectInputMode()) {
             moveCursor((int) newPos.x, (int) newPos.y);
         }
 
         mDesktopCanvas.repositionImage(true);
     }
 
     /** Moves the cursor to the specified position on the screen. */
     private void moveCursorToScreenPoint(float screenX, float screenY) {
         float[] imagePoint = mapScreenPointToImagePoint(screenX, screenY);
         moveCursor((int) imagePoint[0], (int) imagePoint[1]);
@@ skipping 86 matching lines @@
             }
 
             float[] delta = {distanceX, distanceY};
             synchronized (mRenderData) {
                 Matrix canvasToImage = new Matrix();
                 mRenderData.transform.invert(canvasToImage);
                 canvasToImage.mapVectors(delta);
             }
 
             moveViewportByOffset(delta[0], delta[1]);
+            if (!mInputStrategy.isIndirectInputMode() && mIsDragging) {
+                // Ensure the cursor follows the user's finger when the user is dragging under
+                // direct input mode.
+                moveCursorToScreenPoint(e2.getX(), e2.getY());
+            }
             return true;
         }
 
         /**
          * Called when a fling gesture is recognized.
          */
         @Override
         public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
             if (mSuppressFling) {
                 return false;
@@ skipping 131 matching lines @@
             synchronized (mRenderData) {
                 imageWidth = (float) mRenderData.imageWidth + EPSILON;
                 imageHeight = (float) mRenderData.imageHeight + EPSILON;
             }
 
             return mappedPoints[0] < -EPSILON || mappedPoints[0] > imageWidth
                     || mappedPoints[1] < -EPSILON || mappedPoints[1] > imageHeight;
         }
     }
 }