Remove incorrect Robolectric overrides for fling velocity

Robolectric was using incorrect values for fling velocity
values in ViewConfiguration. It was using '4000' as the base fling
velocity, which comes from pre-JB. The correct base value is '8000'

This is part of the effort to remove ShadowViewConfiguration in favor
of the real Android code.

PiperOrigin-RevId: 627449715

2 files changed, 3 insertions, 23 deletions

diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowViewConfigurationTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowViewConfigurationTest.java
index febfd9b0c..0f240e7f4 100644
--- a/robolectric/src/test/java/org/robolectric/shadows/ShadowViewConfigurationTest.java
+++ b/robolectric/src/test/java/org/robolectric/shadows/ShadowViewConfigurationTest.java
@@ -46,7 +46,7 @@ public class ShadowViewConfigurationTest {
     assertEquals(16, ViewConfiguration.getTouchSlop());
     assertEquals(16, ViewConfiguration.getWindowTouchSlop());
     assertEquals(50, ViewConfiguration.getMinimumFlingVelocity());
-    assertEquals(4000, ViewConfiguration.getMaximumFlingVelocity());
+    assertEquals(8000, ViewConfiguration.getMaximumFlingVelocity());
     assertEquals(480 * 800 * 4, ViewConfiguration.getMaximumDrawingCacheSize());
     assertEquals(3000, ViewConfiguration.getZoomControlsTimeout());
     assertEquals(500, ViewConfiguration.getGlobalActionKeyTimeout());
@@ -62,7 +62,7 @@ public class ShadowViewConfigurationTest {
     assertEquals(100, viewConfiguration.getScaledDoubleTapSlop());
     assertEquals(16, viewConfiguration.getScaledWindowTouchSlop());
     assertEquals(50, viewConfiguration.getScaledMinimumFlingVelocity());
-    assertEquals(4000, viewConfiguration.getScaledMaximumFlingVelocity());
+    assertEquals(8000, viewConfiguration.getScaledMaximumFlingVelocity());
     // The min value of getScaledMaximumDrawingCacheSize is 480 * 800 * 4.
     assertEquals(480 * 800 * 4, viewConfiguration.getScaledMaximumDrawingCacheSize());
     assertThat(viewConfiguration.isFadingMarqueeEnabled()).isFalse();
@@ -87,7 +87,7 @@ public class ShadowViewConfigurationTest {
     assertEquals(150, viewConfiguration.getScaledDoubleTapSlop());
     assertEquals(24, viewConfiguration.getScaledWindowTouchSlop());
     assertEquals(75, viewConfiguration.getScaledMinimumFlingVelocity());
-    assertEquals(6000, viewConfiguration.getScaledMaximumFlingVelocity());
+    assertEquals(12000, viewConfiguration.getScaledMaximumFlingVelocity());
     assertThat(viewConfiguration.getScaledOverflingDistance()).isEqualTo(9);
     if (RuntimeEnvironment.getApiLevel() >= Q) {
       assertThat(viewConfiguration.getScaledMinimumScalingSpan()).isEqualTo(255);
diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowViewConfiguration.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowViewConfiguration.java
index 97de02d9a..10512159d 100644
--- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowViewConfiguration.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowViewConfiguration.java
@@ -52,15 +52,12 @@ public class ShadowViewConfiguration {
   private static final int PAGING_TOUCH_SLOP = TOUCH_SLOP * 2;
   private static final int DOUBLE_TAP_SLOP = 100;
   private static final int WINDOW_TOUCH_SLOP = 16;
-  private static final int MAXIMUM_FLING_VELOCITY = 4000;
 
   // The previous hardcoded value for draw cache size. Some screenshot tests depend on this value.
   private static final int MIN_MAXIMUM_DRAWING_CACHE_SIZE = 480 * 800 * 4;
 
   private int edgeSlop;
   private int fadingEdgeLength;
-  private int minimumFlingVelocity;
-  private int maximumFlingVelocity;
   private int touchSlop;
   private int pagingTouchSlop;
   private int doubleTapSlop;
@@ -79,8 +76,6 @@ public class ShadowViewConfiguration {
     float density = metrics.density;
     edgeSlop = (int) (density * ViewConfiguration.getEdgeSlop() + 0.5f);
     fadingEdgeLength = (int) (density * ViewConfiguration.getFadingEdgeLength() + 0.5f);
-    minimumFlingVelocity = (int) (density * ViewConfiguration.getMinimumFlingVelocity() + 0.5f);
-    maximumFlingVelocity = (int) (density * ViewConfiguration.getMaximumFlingVelocity() + 0.5f);
     touchSlop = (int) (density * TOUCH_SLOP + 0.5f);
     pagingTouchSlop = (int) (density * PAGING_TOUCH_SLOP + 0.5f);
     doubleTapSlop = (int) (density * DOUBLE_TAP_SLOP + 0.5f);
@@ -157,21 +152,6 @@ public class ShadowViewConfiguration {
   }
 
   @Implementation
-  protected int getScaledMinimumFlingVelocity() {
-    return minimumFlingVelocity;
-  }
-
-  @Implementation
-  protected static int getMaximumFlingVelocity() {
-    return MAXIMUM_FLING_VELOCITY;
-  }
-
-  @Implementation
-  protected int getScaledMaximumFlingVelocity() {
-    return maximumFlingVelocity;
-  }
-
-  @Implementation
   protected int getScaledMaximumDrawingCacheSize() {
     return maximumDrawingCacheSize;
   }