DO NOT MERGE

TouchTest: ensure scroll amount is larger than touch slop

Test failed when the difference between display and text width was less than
the touch slop, which could happen for certain display resolutions.

Bug: 299950514
Test: atest android.text.method.cts.TouchTest
Change-Id: Idd2d54435c6393331911eb147c3e010ab2fba615

Author: jhenninger

tests/tests/text/src/android/text/method/cts/TouchTest.java

@@ -29,6 +29,7 @@
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
 import android.view.MotionEvent;
+import android.view.ViewConfiguration;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
@@ -117,17 +118,18 @@ public void testOnTouchEvent() throws Throwable {
         // Create a string that is wider than the screen.
         DisplayMetrics metrics = mActivity.getResources().getDisplayMetrics();
         int screenWidth = metrics.widthPixels;
+        int touchSlop = ViewConfiguration.get(mActivity).getScaledTouchSlop();
         TextPaint paint = mTextView.getPaint();
         String text = LONG_TEXT;
         int textWidth = Math.round(paint.measureText(text));
-        while (textWidth < screenWidth) {
+        while (textWidth < screenWidth + touchSlop) {
             text += LONG_TEXT;
             textWidth = Math.round(paint.measureText(text));
         }
 
         // Drag the difference between the text width and the screen width.
         int dragAmount = Math.min(screenWidth, textWidth - screenWidth);
-        assertTrue(dragAmount > 0);
+        assertTrue(dragAmount > touchSlop);
         final String finalText = text;
         final SpannableString spannable = new SpannableString(finalText);
         mActivityRule.runOnUiThread(() -> {