[Remoting Android] Move feedback type to radius logic out of DesktopView

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.Matrix;
 import android.graphics.PointF;
 import android.text.InputType;
@@ skipping 30 matching lines @@
      * Subclass should trigger this event when the host (desktop frame) size is changed.
      */
     protected final Event.Raisable<SizeChangedEventParameter> mOnHostSizeChanged =
             new Event.Raisable<>();
 
     /**
      * Subclass should trigger this event when a frame is rendered.
      */
     protected final Event.Raisable<Void> mOnCanvasRendered = 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;
         mInputHandler = new TouchInputHandler(this, desktop);
         mInputHandler.init(desktop, new InputEventSender(client));
-
-        // Give this view keyboard focus, allowing us to customize the soft keyboard's settings.
-        setFocusableInTouchMode(true);
-
-        mTinyFeedbackPixelRadius =
-                getResources().getDimensionPixelSize(R.dimen.feedback_animation_radius_tiny);
-
-        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 42 matching lines @@
     }
 
     /** Called whenever the user attempts to touch the canvas. */
     @Override
     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, float scaleFactor) {
-        switch (feedbackToShow) {
-            case NONE:
-                return 0.0f;
-            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);
 
     /**
      * Informs the view that its transformation matrix (for rendering the remote desktop bitmap)
      * has been changed by the TouchInputHandler, which requires repainting.
      */
     public abstract void transformationChanged(Matrix matrix);
 
     /**
      * Informs the view that the cursor has been moved by the TouchInputHandler, which requires
      * repainting.
      */
     public abstract void cursorMoved(PointF position);
 
     /**
      * Informs the view that the cursor visibility has been changed (for different input mode) by
      * the TouchInputHandler, which requires repainting.
      */
     public abstract void cursorVisibilityChanged(boolean visible);
 }