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

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

 // Copyright 2016 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.graphics.Matrix;
 import android.graphics.PointF;
 import android.view.SurfaceHolder;
 
 import org.chromium.chromoting.jni.Client;
 import org.chromium.chromoting.jni.GlDisplay;
 
 /**
  * The user interface for viewing and interacting with a specific remote host. Uses OpenGL to draw
  * the desktop and cursor. Should be used entirely on the UI thread.
  */
 public class GlDesktopView extends DesktopView implements SurfaceHolder.Callback {
     private final GlDisplay mDisplay;
 
     private Object mOnHostSizeChangedListenerKey;
     private Object mOnCanvasRenderedListenerKey;
 
     private Event.ParameterRunnable<Void> mProcessAnimationRunnable;
 
-    private float mScaleFactor;
+    private final InputFeedbackRadiusMapper mMapper;
+
+    private float mScaleFactor = 0;

[Hzj_jie, 2016/08/31 01:31:59]

I believe usually you do not need to actively initialize a float to 0. Java
itself will do it for you.

[Yuwei, 2016/08/31 01:36:13]

I think you are right... Remove this?

[Hzj_jie, 2016/08/31 01:38:43]

Yes, I suggest to do so to keep consistent. And I believe usually we put final
fields before others. So you may want to move mMapper before
mOnHostSizeChangedListenerKey.

[Yuwei, 2016/08/31 18:25:34]

Done.

 
     public GlDesktopView(GlDisplay display, Desktop desktop, Client client) {
         super(desktop, client);
         Preconditions.notNull(display);
         mDisplay = display;
 
         mProcessAnimationRunnable = new Event.ParameterRunnable<Void>() {
             @Override
             public void run(Void p) {
                 mInputHandler.processAnimation();
             }
         };
 
-        mScaleFactor = 0;
+        mMapper = new InputFeedbackRadiusMapper(this);
 
         getHolder().addCallback(this);
     }
 
     @Override
     public void showInputFeedback(InputFeedbackType feedbackToShow, PointF pos) {
-        float diameter = getFeedbackRadius(feedbackToShow, mScaleFactor) * 2.0f;
+        float diameter = mMapper.getFeedbackRadius(feedbackToShow, mScaleFactor) * 2.0f;
         if (diameter <= 0.0f) {
             return;
         }
         mDisplay.showCursorInputFeedback(pos.x, pos.y, diameter);
     }
 
     @Override
     public void transformationChanged(Matrix matrix) {
         float[] matrixArray = new float[9];
         matrix.getValues(matrixArray);
@@ skipping 49 matching lines @@
         // the listeners when the surface is about to be destroyed.
         if (mOnHostSizeChangedListenerKey != null) {
             mDisplay.onHostSizeChanged().remove(mOnHostSizeChangedListenerKey);
         }
         if (mOnCanvasRenderedListenerKey != null) {
             mDisplay.onCanvasRendered().remove(mOnCanvasRenderedListenerKey);
         }
         mDisplay.surfaceDestroyed();
     }
 }