[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

5 files changed, 9 insertions, 82 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);
 }
diff --git a/ui/gfx/android/view_configuration.cc b/ui/gfx/android/view_configuration.cc
index 16c8617..2676e6b 100644
--- a/ui/gfx/android/view_configuration.cc
+++ b/ui/gfx/android/view_configuration.cc
@@ -25,9 +25,7 @@ struct ViewConfigurationData {
         max_fling_velocity_in_pixels_s_(0),
         min_fling_velocity_in_pixels_s_(0),
         touch_slop_in_pixels_(0),
-        double_tap_slop_in_pixels_(0),
-        min_scaling_span_in_pixels_(0),
-        min_scaling_touch_major_in_pixels_(0) {
+        double_tap_slop_in_pixels_(0) {
     JNIEnv* env = AttachCurrentThread();
     j_view_configuration_helper_.Reset(
         Java_ViewConfigurationHelper_createWithListener(
@@ -45,9 +43,7 @@ struct ViewConfigurationData {
         Java_ViewConfigurationHelper_getScaledMaximumFlingVelocity(env, obj),
         Java_ViewConfigurationHelper_getScaledMinimumFlingVelocity(env, obj),
         Java_ViewConfigurationHelper_getScaledTouchSlop(env, obj),
-        Java_ViewConfigurationHelper_getScaledDoubleTapSlop(env, obj),
-        Java_ViewConfigurationHelper_getScaledMinScalingSpan(env, obj),
-        Java_ViewConfigurationHelper_getScaledMinScalingTouchMajor(env, obj));
+        Java_ViewConfigurationHelper_getScaledDoubleTapSlop(env, obj));
   }
 
   ~ViewConfigurationData() {}
@@ -55,16 +51,12 @@ struct ViewConfigurationData {
   void SynchronizedUpdate(int scaled_maximum_fling_velocity,
                           int scaled_minimum_fling_velocity,
                           int scaled_touch_slop,
-                          int scaled_double_tap_slop,
-                          int scaled_min_scaling_span,
-                          int scaled_min_scaling_touch_major) {
+                          int scaled_double_tap_slop) {
     base::AutoLock autolock(lock_);
     Update(scaled_maximum_fling_velocity,
            scaled_minimum_fling_velocity,
            scaled_touch_slop,
-           scaled_double_tap_slop,
-           scaled_min_scaling_span,
-           scaled_min_scaling_touch_major);
+           scaled_double_tap_slop);
   }
 
   int double_tap_timeout_in_ms() const { return double_tap_timeout_in_ms_; }
@@ -92,30 +84,16 @@ struct ViewConfigurationData {
     return double_tap_slop_in_pixels_;
   }
 
-  int min_scaling_span_in_pixels() {
-    base::AutoLock autolock(lock_);
-    return min_scaling_span_in_pixels_;
-  }
-
-  int min_scaling_touch_major_in_pixels() {
-    base::AutoLock autolock(lock_);
-    return min_scaling_touch_major_in_pixels_;
-  }
-
  private:
   void Update(int scaled_maximum_fling_velocity,
               int scaled_minimum_fling_velocity,
               int scaled_touch_slop,
-              int scaled_double_tap_slop,
-              int scaled_min_scaling_span,
-              int scaled_min_scaling_touch_major) {
+              int scaled_double_tap_slop) {
     DCHECK_LE(scaled_minimum_fling_velocity, scaled_maximum_fling_velocity);
     max_fling_velocity_in_pixels_s_ = scaled_maximum_fling_velocity;
     min_fling_velocity_in_pixels_s_ = scaled_minimum_fling_velocity;
     touch_slop_in_pixels_ = scaled_touch_slop;
     double_tap_slop_in_pixels_ = scaled_double_tap_slop;
-    min_scaling_span_in_pixels_ = scaled_min_scaling_span;
-    min_scaling_touch_major_in_pixels_ = scaled_min_scaling_touch_major;
   }
 
   base::Lock lock_;
@@ -134,8 +112,6 @@ struct ViewConfigurationData {
   int min_fling_velocity_in_pixels_s_;
   int touch_slop_in_pixels_;
   int double_tap_slop_in_pixels_;
-  int min_scaling_span_in_pixels_;
-  int min_scaling_touch_major_in_pixels_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ViewConfigurationData);
@@ -152,15 +128,11 @@ static void UpdateSharedViewConfiguration(JNIEnv* env,
                                           jint scaled_maximum_fling_velocity,
                                           jint scaled_minimum_fling_velocity,
                                           jint scaled_touch_slop,
-                                          jint scaled_double_tap_slop,
-                                          jint scaled_min_scaling_span,
-                                          jint scaled_min_scaling_touch_major) {
+                                          jint scaled_double_tap_slop) {
   g_view_configuration.Get().SynchronizedUpdate(scaled_maximum_fling_velocity,
                                                 scaled_minimum_fling_velocity,
                                                 scaled_touch_slop,
-                                                scaled_double_tap_slop,
-                                                scaled_min_scaling_span,
-                                                scaled_min_scaling_touch_major);
+                                                scaled_double_tap_slop);
 }
 
 int ViewConfiguration::GetDoubleTapTimeoutInMs() {
@@ -195,14 +167,6 @@ int ViewConfiguration::GetDoubleTapSlopInPixels() {
   return g_view_configuration.Get().double_tap_slop_in_pixels();
 }
 
-int ViewConfiguration::GetMinScalingSpanInPixels() {
-  return g_view_configuration.Get().min_scaling_span_in_pixels();
-}
-
-int ViewConfiguration::GetMinScalingTouchMajorInPixels() {
-  return g_view_configuration.Get().min_scaling_touch_major_in_pixels();
-}
-
 bool ViewConfiguration::RegisterViewConfiguration(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
diff --git a/ui/gfx/android/view_configuration.h b/ui/gfx/android/view_configuration.h
index 4595071..2a6af49 100644
--- a/ui/gfx/android/view_configuration.h
+++ b/ui/gfx/android/view_configuration.h
@@ -28,9 +28,6 @@ class GFX_EXPORT ViewConfiguration {
   static int GetTouchSlopInPixels();
   static int GetDoubleTapSlopInPixels();
 
-  static int GetMinScalingSpanInPixels();
-  static int GetMinScalingTouchMajorInPixels();
-
   // Registers methods with JNI and returns true if succeeded.
   static bool RegisterViewConfiguration(JNIEnv* env);
 };