Updating initial zoom level for remote connections in Android Client.

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

 // Copyright 2015 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.PointF;
 import android.graphics.RectF;
 
 /**
@@ skipping 73 matching lines @@
     public PointF getViewportSize() {
         float adjustedScreenWidth, adjustedScreenHeight;
         synchronized (mRenderData) {
             adjustedScreenWidth = mRenderData.screenWidth - mInputMethodOffsetX;
             adjustedScreenHeight = mRenderData.screenHeight - mInputMethodOffsetY;
         }
 
         return new PointF(adjustedScreenWidth, adjustedScreenHeight);
     }
 
-    /** Repositions the image by zooming it such that the complete image fits on the screen. */
+    /** Repositions the image by zooming it such that the image is displayed without borders. */
     public void resizeImageToFitScreen() {
         synchronized (mRenderData) {
             // Protect against being called before the image has been initialized.
             if (mRenderData.imageWidth == 0 || mRenderData.imageHeight == 0) {
                 return;
             }
 
-            float screenToImageScale = 1.0f;
-            float[] imageSize = {mRenderData.imageWidth, mRenderData.imageHeight};
-            mRenderData.transform.mapVectors(imageSize);
-
-            // If the image is smaller than the screen in both dimensions, then we want
-            // to scale it up to fit.
-            boolean scaleImageUp = imageSize[0] < mRenderData.screenWidth
-                    && imageSize[1] < mRenderData.screenHeight;
-
-            // If the image is larger than the screen in any dimension, we want to
-            // shrink it to fit.
-            boolean scaleImageDown = imageSize[0] > mRenderData.screenWidth
-                    || imageSize[1] > mRenderData.screenHeight;
-
-            if (scaleImageUp || scaleImageDown) {
-                // Displayed image is too small or too large to fit the screen dimensions.
-                // Apply the minimum scale needed to fit both the width and height.
-                screenToImageScale =
-                        Math.min((float) mRenderData.screenWidth / mRenderData.imageWidth,
-                                 (float) mRenderData.screenHeight / mRenderData.imageHeight);
+            float widthRatio = (float) mRenderData.screenWidth / mRenderData.imageWidth;
+            float heightRatio = (float) mRenderData.screenHeight / mRenderData.imageHeight;
+            float screenToImageScale = Math.max(widthRatio, heightRatio);
+            // If the image is smaller than the screen in either dimension, then we want to scale it

[Lambros, 2016/06/10 01:01:51]

Blank line before comment please.

[joedow, 2016/06/10 03:46:16]

Done.

+            // up to fit both and fill the screen with the image of the remote desktop.
+            if (screenToImageScale > 1.0f) {
                 mRenderData.transform.setScale(screenToImageScale, screenToImageScale);
             }
         }
 
-        repositionImage(true);
+        repositionImage(false);
     }
 
     /**
      * Repositions the image by translating it (without affecting the zoom level).
      *
      * @param centerViewport Determines whether the viewport will be translated to the desired
      *                       center position before being adjusted to fit the screen boundaries.
      */
     public void repositionImage(boolean centerViewport) {
         PointF adjustedViewportSize = getViewportSize();
@@ skipping 82 matching lines @@
                 // level needed to fit either the width or height.
                 float scale = Math.min((float) mRenderData.screenWidth / mRenderData.imageWidth,
                                        (float) mRenderData.screenHeight / mRenderData.imageHeight);
                 mRenderData.transform.setScale(scale, scale);
             }
         }
 
         repositionImage(centerViewport);
     }
 }