[Android] Remove runtime scaling constant queries

These constants are missing on certain devices, and won't actually be needed
until crrev.com/171773012 lands.  Remove them entirely to prevent further
breakage on Blink dbg bots.

BUG=345602
TBR=yfriedman@chromium.org

Review URL: https://codereview.chromium.org/175693009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252816 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 2 insertions, 36 deletions

diff --git a/ui/android/java/res/values/dimens.xml b/ui/android/java/res/values/dimens.xml
index 2c16c3f..ef768b7 100644
--- a/ui/android/java/res/values/dimens.xml
+++ b/ui/android/java/res/values/dimens.xml
@@ -15,12 +15,4 @@
     <dimen name="autofill_text_height">44dp</dimen>
     <dimen name="autofill_text_divider_height">1px</dimen>
 
-    <!--
-         Fallback values if the corresponding com.android.internal.R dimensions
-         cannot be retrieved by name.
-         Note: Constants taken directly from Android's core/res/values/config.xml.
-    -->
-    <dimen name="config_minScalingSpan">27.0mm</dimen>
-    <dimen name="config_minScalingTouchMajor">48.0dp</dimen>
-
 </resources>
diff --git a/ui/android/java/resource_map/org/chromium/ui/R.java b/ui/android/java/resource_map/org/chromium/ui/R.java
index 309edc6..0943130 100644
--- a/ui/android/java/resource_map/org/chromium/ui/R.java
+++ b/ui/android/java/resource_map/org/chromium/ui/R.java
@@ -73,7 +73,5 @@ public final class R {
         public static int autofill_text_height;
         public static int autofill_text_divider_height;
         public static int color_button_height;
-        public static int config_minScalingSpan;
-        public static int config_minScalingTouchMajor;
     }
 }
diff --git a/ui/android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java b/ui/android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java
index a6ef398..7e17043 100644
--- a/ui/android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java
+++ b/ui/android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java
@@ -7,12 +7,10 @@ package org.chromium.ui.gfx;
 import android.content.ComponentCallbacks;
 import android.content.Context;
 import android.content.res.Configuration;
-import android.content.res.Resources;
 import android.view.ViewConfiguration;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
-import org.chromium.ui.R;
 
 /**
  * This class facilitates access to ViewConfiguration-related properties, also
@@ -53,9 +51,7 @@ public class ViewConfigurationHelper {
                 getScaledMaximumFlingVelocity(),
                 getScaledMinimumFlingVelocity(),
                 getScaledTouchSlop(),
-                getScaledDoubleTapSlop(),
-                getScaledMinScalingSpan(),
-                getScaledMinScalingTouchMajor());
+                getScaledDoubleTapSlop());
     }
 
     @CalledByNative
@@ -99,25 +95,6 @@ public class ViewConfigurationHelper {
     }
 
     @CalledByNative
-    private int getScaledMinScalingSpan() {
-        final Resources res = mAppContext.getResources();
-        int id = res.getIdentifier("config_minScalingSpan", "dimen", "android");
-        // Fall back to a sensible default if the internal identifier does not exist.
-        if (id == 0) id = res.getDimensionPixelSize(R.dimen.config_minScalingSpan);
-        return res.getDimensionPixelSize(id);
-
-    }
-
-    @CalledByNative
-    private int getScaledMinScalingTouchMajor() {
-        final Resources res = mAppContext.getResources();
-        int id = res.getIdentifier("config_minScalingTouchMajor", "dimen", "android");
-        // Fall back to a sensible default if the internal identifier does not exist.
-        if (id == 0) id = res.getDimensionPixelSize(R.dimen.config_minScalingTouchMajor);
-        return res.getDimensionPixelSize(id);
-    }
-
-    @CalledByNative
     private static ViewConfigurationHelper createWithListener(Context context) {
         ViewConfigurationHelper viewConfigurationHelper = new ViewConfigurationHelper(context);
         viewConfigurationHelper.registerListener();
@@ -126,6 +103,5 @@ public class ViewConfigurationHelper {
 
     private native void nativeUpdateSharedViewConfiguration(
             int scaledMaximumFlingVelocity, int scaledMinimumFlingVelocity,
-            int scaledTouchSlop, int scaledDoubleTapSlop,
-            int scaledMinScalingSpan, int scaledMinScalingTouchMajor);
+            int scaledTouchSlop, int scaledDoubleTapSlop);
 }