[Remoting Android] New touch feedback texture

remoting/android/java/src/org/chromium/chromoting/DesktopView.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.PointF;
 import android.text.InputType;
 import android.view.MotionEvent;
 import android.view.SurfaceView;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputMethodManager;
 
 import org.chromium.chromoting.jni.Client;
 
 /**
  * The abstract class for viewing and interacting with a specific remote host. Handles logic
  * for touch input and render data.
  */
 public abstract class DesktopView extends SurfaceView {
     /** Used to define the animation feedback shown when a user touches the screen. */
-    public enum InputFeedbackType { NONE, SMALL_ANIMATION, LARGE_ANIMATION }
+    public enum InputFeedbackType {
+        NONE,
+        SHORT_TOUCH_ANIMATION,
+        LONG_TOUCH_ANIMATION,
+        LONG_TRACKPAD_ANIMATION
+    }
 
     protected final RenderData mRenderData;
     protected final TouchInputHandler mInputHandler;
 
     /**
      * Subclass should trigger this event when the client view size is changed.
      */
     protected final Event.Raisable<SizeChangedEventParameter> mOnClientSizeChanged =
             new Event.Raisable<>();
 
     /**
      * Subclass should trigger this event when the host (desktop frame) size is changed.
      */
     protected final Event.Raisable<SizeChangedEventParameter> mOnHostSizeChanged =
             new Event.Raisable<>();
 
+    private final int mTinyFeedbackPixelRadius;
     private final int mSmallFeedbackPixelRadius;
     private final int mLargeFeedbackPixelRadius;
 
     /** The parent Desktop activity. */
     private final Desktop mDesktop;
 
     private final Event.Raisable<TouchEventParameter> mOnTouch = new Event.Raisable<>();
 
     public DesktopView(Desktop desktop, Client client) {
         super(desktop);
         Preconditions.notNull(desktop);
         Preconditions.notNull(client);
         mDesktop = desktop;
         mRenderData = new RenderData();
         mInputHandler = new TouchInputHandler(this, desktop, mRenderData);
         mInputHandler.init(desktop, new InputEventSender(client));
 
         // Give this view keyboard focus, allowing us to customize the soft keyboard's settings.
         setFocusableInTouchMode(true);
 
-        mSmallFeedbackPixelRadius = getResources()
-                .getDimensionPixelSize(R.dimen.feedback_animation_radius_small);
+        mTinyFeedbackPixelRadius =
+                getResources().getDimensionPixelSize(R.dimen.feedback_animation_radius_tiny);
 
-        mLargeFeedbackPixelRadius = getResources()
-                .getDimensionPixelSize(R.dimen.feedback_animation_radius_large);
+        mSmallFeedbackPixelRadius =
+                getResources().getDimensionPixelSize(R.dimen.feedback_animation_radius_small);
+
+        mLargeFeedbackPixelRadius =
+                getResources().getDimensionPixelSize(R.dimen.feedback_animation_radius_large);
     }
 
     // TODO(yuweih): move showActionBar and showKeyboard out of this abstract class.
     /** Shows the action bar. */
     public final void showActionBar() {
         mDesktop.showSystemUi();
     }
 
     /** Shows the software keyboard. */
     public final void showKeyboard() {
@@ skipping 41 matching lines @@
     public final boolean onTouchEvent(MotionEvent event) {
         TouchEventParameter parameter = new TouchEventParameter(event);
         mOnTouch.raise(parameter);
         return parameter.handled;
     }
 
     /**
      * Returns the radius of the given feedback type.
      * 0.0f will be returned if no feedback should be shown.
      */
-    protected final float getFeedbackRadius(InputFeedbackType feedbackToShow) {
+    protected final float getFeedbackRadius(InputFeedbackType feedbackToShow, float scaleFactor) {
         switch (feedbackToShow) {
             case NONE:
                 return 0.0f;
-            case SMALL_ANIMATION:
-                return mSmallFeedbackPixelRadius;
-            case LARGE_ANIMATION:
-                return mLargeFeedbackPixelRadius;
+            case SHORT_TOUCH_ANIMATION:
+                return mSmallFeedbackPixelRadius / scaleFactor;
+            case LONG_TOUCH_ANIMATION:
+                return mLargeFeedbackPixelRadius / scaleFactor;
+            case LONG_TRACKPAD_ANIMATION:
+                // The size of the longpress trackpad animation is supposed to be close to the size
+                // of the cursor so it doesn't need to be normalized and should be scaled with the
+                // canvas.
+                return mTinyFeedbackPixelRadius;
             default:
                 // Unreachable, but required by Google Java style and findbugs.
                 assert false : "Unreached";
                 return 0.0f;
         }
     }
 
     /** Triggers a brief animation to indicate the existence and location of an input event. */
     public abstract void showInputFeedback(InputFeedbackType feedbackToShow, PointF pos);
 
@@ skipping 14 matching lines @@
      * the TouchInputHandler, which requires repainting.
      */
     public abstract void cursorVisibilityChanged();
 
     /**
      * Starts or stops an animation. Whilst the animation is running, the DesktopView will
      * periodically call TouchInputHandler.processAnimation() and repaint itself.
      */
     public abstract void setAnimationEnabled(boolean enabled);
 }