[Remoting Android] Define feedback animation size in dp

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.Point;
 import android.view.SurfaceHolder;
+import android.view.View;
 
 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 AbstractDesktopView implements SurfaceHolder.Callback {
     private final GlDisplay mDisplay;
 
     private Object mOnHostSizeChangedListenerKey;
     private Object mOnCanvasRenderedListenerKey;
 
+    private static float sSmallFeedbackPixelDiameter = -1;
+    private static float sLargeFeedbackPixelDiameter = -1;
+
     public GlDesktopView(GlDisplay display, Desktop desktop, Client client) {
         super(desktop, client);
         Preconditions.notNull(display);
         mDisplay = display;
 
         getHolder().addCallback(this);
     }
 
-    @Override
-    public void showInputFeedback(InputFeedbackType feedbackToShow, Point pos) {
-        float diameter;
-        // TODO(yuweih): diameter (and radius in DesktopView) should be defined in dp so that it is
-        // DPI independent.
-        switch (feedbackToShow) {
+    private static float getFeedbackDiameterInPixel(InputFeedbackType feedbackType, View view) {
+        // Note that the OpenGL renderer takes diameter as argument so the radius we got needs
+        // to be multiplied by 2.
+        switch (feedbackType) {
+            case SMALL_ANIMATION:
+                if (sSmallFeedbackPixelDiameter < 0) {
+                    sSmallFeedbackPixelDiameter = 2 * view.getResources()
+                            .getDimensionPixelSize(R.dimen.feedback_animation_radius_small);
+                }
+                return sSmallFeedbackPixelDiameter;
+
             case LARGE_ANIMATION:
-                diameter = 320.f;
-                break;
-            case SMALL_ANIMATION:
-                diameter = 80.f;
-                break;
+                if (sLargeFeedbackPixelDiameter < 0) {
+                    sLargeFeedbackPixelDiameter = 2 * view.getResources()
+                            .getDimensionPixelSize(R.dimen.feedback_animation_radius_large);
+                }
+                return sLargeFeedbackPixelDiameter;
+
             default:
-                return;
+                // Unreachable, but required by Google Java style and findbugs.
+                assert false : "Unreached";
+                return 0.0f;
         }
-        float scaleFactor = mRenderData.transform.mapRadius(1);
-        mDisplay.showCursorInputFeedback(pos.x, pos.y, diameter / scaleFactor);
     }
 
     @Override
+    public void showInputFeedback(InputFeedbackType feedbackType, Point pos) {
+        float scaleFactor = mRenderData.transform.mapRadius(1);
+        mDisplay.showCursorInputFeedback(pos.x, pos.y,
+                getFeedbackDiameterInPixel(feedbackType, this) / scaleFactor);
+    }
+
+    @Override
     public void transformationChanged() {
         if (mRenderData.imageHeight == 0 || mRenderData.imageWidth == 0
                 || mRenderData.screenHeight == 0 || mRenderData.screenWidth == 0) {
             return;
         }
         float[] matrix = new float[9];
         mRenderData.transform.getValues(matrix);
         mDisplay.pixelTransformationChanged(matrix);
     }
 
@@ skipping 57 matching lines @@
     @Override
     public void surfaceDestroyed(SurfaceHolder holder) {
         // GlDisplay's life time spans to the whole session while GlDesktopView may be created and
         // destroyed for multiple times (say when the phone is rotated). It is important to remove
         // the listeners when the surface is about to be destroyed.
         mDisplay.onHostSizeChanged().remove(mOnHostSizeChangedListenerKey);
         mDisplay.onCanvasRendered().remove(mOnCanvasRenderedListenerKey);
         mDisplay.surfaceDestroyed();
     }
 }