[Chromecast] Handle device scale factor correctly

chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastShellActivity.java

 // Copyright 2014 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.chromecast.shell;
 
 import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.media.AudioManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.content.LocalBroadcastManager;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.WindowManager;
 import android.widget.Toast;
 
-import org.chromium.base.CommandLine;
 import org.chromium.base.Log;
 import org.chromium.content.browser.ActivityContentVideoViewEmbedder;
 import org.chromium.content.browser.ContentVideoViewEmbedder;
 import org.chromium.content.browser.ContentViewClient;
 import org.chromium.content.browser.ContentViewCore;
-import org.chromium.content.common.ContentSwitches;
 import org.chromium.ui.base.WindowAndroid;
 
 /**
  * Activity for managing the Cast shell.
  */
 public class CastShellActivity extends Activity {
     private static final String TAG = "cr_CastShellActivity";
     private static final boolean DEBUG = false;
 
     private static final String ACTIVE_SHELL_URL_KEY = "activeUrl";
-    private static final int DEFAULT_HEIGHT_PIXELS = 720;
-    public static final String ACTION_EXTRA_RESOLUTION_HEIGHT =
-            "org.chromium.chromecast.shell.intent.extra.RESOLUTION_HEIGHT";
 
     private CastWindowManager mCastWindowManager;
     private AudioManager mAudioManager;
     private BroadcastReceiver mBroadcastReceiver;
     private boolean mReceivedUserLeave = false;
 
     // Native window instance.
     // TODO(byungchul, gunsch): CastShellActivity, CastWindowAndroid, and native CastWindowAndroid
     // have a one-to-one relationship. Consider instantiating CastWindow here and CastWindow having
     // this native shell instance.
@@ skipping 53 matching lines @@
                 public void onCreated() {
                 }
 
                 @Override
                 public void onClosed() {
                     mNativeCastWindow = 0;
                     mCastWindowManager.setDelegate(null);
                     finish();
                 }
             });
-        setResolution();
         mCastWindowManager.setWindow(new WindowAndroid(this));
 
         registerBroadcastReceiver();
 
         String url = getIntent().getDataString();
         Log.d(TAG, "onCreate startupUrl: %s", url);
         mNativeCastWindow = mCastWindowManager.launchCastWindow(url);
 
         getActiveContentViewCore().setContentViewClient(new ContentViewClient() {
             @Override
@@ skipping 137 matching lines @@
         devtoolsBroadcastIntentFilter.addAction(CastWindowAndroid.ACTION_DISABLE_DEV_TOOLS);
         LocalBroadcastManager.getInstance(this)
                 .registerReceiver(mBroadcastReceiver, devtoolsBroadcastIntentFilter);
     }
 
     private void unregisterBroadcastReceiver() {
         LocalBroadcastManager broadcastManager = LocalBroadcastManager.getInstance(this);
         broadcastManager.unregisterReceiver(mBroadcastReceiver);
     }
 
-    private void setResolution() {
-        CommandLine commandLine = CommandLine.getInstance();
-        int defaultHeight = DEFAULT_HEIGHT_PIXELS;
-        if (commandLine.hasSwitch(CastSwitches.DEFAULT_RESOLUTION_HEIGHT)) {
-            String commandLineHeightString =
-                    commandLine.getSwitchValue(CastSwitches.DEFAULT_RESOLUTION_HEIGHT);
-            try {
-                defaultHeight = Integer.parseInt(commandLineHeightString);
-            } catch (NumberFormatException e) {
-                Log.w(TAG, "Ignored invalid height: %d", commandLineHeightString);
-            }
-        }
-        int requestedHeight =
-                getIntent().getIntExtra(ACTION_EXTRA_RESOLUTION_HEIGHT, defaultHeight);
-        int displayHeight = getResources().getDisplayMetrics().heightPixels;
-        // Clamp within [defaultHeight, displayHeight]
-        int desiredHeight = Math.min(displayHeight, Math.max(defaultHeight, requestedHeight));
-        double deviceScaleFactor = ((double) displayHeight) / desiredHeight;
-        Log.d(TAG, "Using scale factor %f to set height %d", deviceScaleFactor, desiredHeight);
-        commandLine.appendSwitchWithValue(
-                ContentSwitches.FORCE_DEVICE_SCALE_FACTOR, String.valueOf(deviceScaleFactor));
-    }
-
     private void exitIfUrlMissing() {
         Intent intent = getIntent();
         if (intent != null && intent.getData() != null && !intent.getData().equals(Uri.EMPTY)) {
             return;
         }
         // Log an exception so that the exit cause is obvious when reading the logs.
         Log.e(TAG, "Activity will not start",
                 new IllegalArgumentException("Intent did not contain a valid url"));
         System.exit(-1);
     }
@@ skipping 47 matching lines @@
     @Override
     public boolean dispatchTouchEvent(MotionEvent ev) {
         return false;
     }
 
     @Override
     public boolean dispatchTrackballEvent(MotionEvent ev) {
         return false;
     }
 }