Merge "Increase scrollbar areas to accomodate different themes" into android13-tests-dev am: 44f07246f7 am: e09adbd8c5

Original change: https://android-review.googlesource.com/c/platform/cts/+/2454767

Change-Id: Ibbb1e88dba4f461dd1656d08791b880f05bc137e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2 files changed, 53 insertions, 53 deletions

diff --git a/tests/tests/widget/res/layout/horizontal_scrollview.xml b/tests/tests/widget/res/layout/horizontal_scrollview.xml
index c82472b0c1f..11ba673427c 100644
--- a/tests/tests/widget/res/layout/horizontal_scrollview.xml
+++ b/tests/tests/widget/res/layout/horizontal_scrollview.xml
@@ -22,89 +22,89 @@
     <view
         class="android.widget.cts.HorizontalScrollViewTest$MyHorizontalScrollView"
         android:id="@+id/horizontal_scroll_view_custom"
-        android:layout_width="100px"
-        android:layout_height="100px">
+        android:layout_width="200px"
+        android:layout_height="200px">
 
         <LinearLayout
             android:orientation="horizontal"
-            android:layout_width="250px"
+            android:layout_width="500px"
             android:layout_height="wrap_content">
 
             <Button
                 android:id="@+id/first_horizontal_child"
-                android:layout_width="250px"
-                android:layout_height="100px"
+                android:layout_width="500px"
+                android:layout_height="200px"
                 android:text="@string/vertical_text_1"/>
 
             <Button
-                android:layout_width="250px"
-                android:layout_height="100px"
+                android:layout_width="500px"
+                android:layout_height="200px"
                 android:text="@string/vertical_text_2"/>
 
             <Button
-                android:layout_width="250px"
-                android:layout_height="100px"
+                android:layout_width="500px"
+                android:layout_height="200px"
                 android:text="@string/vertical_text_3"/>
 
             <Button
-                android:layout_width="250px"
-                android:layout_height="100px"
+                android:layout_width="500px"
+                android:layout_height="200px"
                 android:text="@string/vertical_text_1"/>
 
             <Button
-                android:layout_width="250px"
-                android:layout_height="100px"
+                android:layout_width="500px"
+                android:layout_height="200px"
                 android:text="@string/vertical_text_2"/>
 
             <Button
-                android:layout_width="250px"
-                android:layout_height="100px"
+                android:layout_width="500px"
+                android:layout_height="200px"
                 android:text="@string/vertical_text_3"/>
 
             <Button
-                android:layout_width="250px"
-                android:layout_height="100px"
+                android:layout_width="500px"
+                android:layout_height="200px"
                 android:text="@string/vertical_text_1"/>
 
             <Button
-                android:layout_width="250px"
-                android:layout_height="100px"
+                android:layout_width="500px"
+                android:layout_height="200px"
                 android:text="@string/vertical_text_2"/>
 
             <Button
-                android:layout_width="250px"
-                android:layout_height="100px"
+                android:layout_width="500px"
+                android:layout_height="200px"
                 android:text="@string/vertical_text_3"/>
 
             <Button
-                android:layout_width="250px"
-                android:layout_height="100px"
+                android:layout_width="500px"
+                android:layout_height="200px"
                 android:text="@string/vertical_text_1"/>
 
             <Button
-                android:layout_width="250px"
-                android:layout_height="100px"
+                android:layout_width="500px"
+                android:layout_height="200px"
                 android:text="@string/vertical_text_2"/>
 
             <Button
-                android:layout_width="250px"
-                android:layout_height="100px"
+                android:layout_width="500px"
+                android:layout_height="200px"
                 android:text="@string/vertical_text_3"/>
 
             <Button
-                android:layout_width="250px"
-                android:layout_height="100px"
+                android:layout_width="500px"
+                android:layout_height="200px"
                 android:text="@string/vertical_text_1"/>
 
             <Button
-                android:layout_width="250px"
-                android:layout_height="100px"
+                android:layout_width="500px"
+                android:layout_height="200px"
                 android:text="@string/vertical_text_2"/>
 
             <Button
                 android:id="@+id/last_horizontal_child"
-                android:layout_width="250px"
-                android:layout_height="100px"
+                android:layout_width="500px"
+                android:layout_height="200px"
                 android:text="@string/vertical_text_3"/>
         </LinearLayout>
 
@@ -118,8 +118,8 @@
     <view
         class="android.widget.cts.HorizontalScrollViewTest$MyHorizontalScrollView"
         android:id="@+id/horizontal_scroll_view_custom_empty"
-        android:layout_width="100px"
-        android:layout_height="100px" />
+        android:layout_width="200px"
+        android:layout_height="200px" />
 
     <view
         class="android.widget.cts.HorizontalScrollViewTest$InterceptView"
@@ -128,8 +128,8 @@
         android:layout_height="wrap_content">
         <HorizontalScrollView
             android:id="@+id/horizontal_scroll_view_stretch"
-            android:layout_width="90px"
-            android:layout_height="90px"
+            android:layout_width="180px"
+            android:layout_height="180px"
             android:background="#FFF">
             <LinearLayout
                 android:layout_width="match_parent"
@@ -137,28 +137,28 @@
                 android:orientation="horizontal">
                 <View
                     android:background="#00F"
-                    android:layout_width="50px"
-                    android:layout_height="90px"/>
+                    android:layout_width="100px"
+                    android:layout_height="180px"/>
                 <View
                     android:background="#0FF"
-                    android:layout_width="50px"
-                    android:layout_height="90px"/>
+                    android:layout_width="100px"
+                    android:layout_height="180px"/>
                 <View
                     android:background="#0F0"
-                    android:layout_width="50px"
-                    android:layout_height="90px"/>
+                    android:layout_width="100px"
+                    android:layout_height="180px"/>
                 <View
                     android:background="#FF0"
-                    android:layout_width="50px"
-                    android:layout_height="90px"/>
+                    android:layout_width="100px"
+                    android:layout_height="180px"/>
                 <View
                     android:background="#F00"
-                    android:layout_width="50px"
-                    android:layout_height="90px"/>
+                    android:layout_width="100px"
+                    android:layout_height="180px"/>
                 <View
                     android:background="#F0F"
-                    android:layout_width="50px"
-                    android:layout_height="90px"/>
+                    android:layout_width="100px"
+                    android:layout_height="180px"/>
             </LinearLayout>
         </HorizontalScrollView>
     </view>
diff --git a/tests/tests/widget/src/android/widget/cts/HorizontalScrollViewTest.java b/tests/tests/widget/src/android/widget/cts/HorizontalScrollViewTest.java
index 0067a8ab837..cf9bb246faf 100644
--- a/tests/tests/widget/src/android/widget/cts/HorizontalScrollViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/HorizontalScrollViewTest.java
@@ -71,11 +71,11 @@ import java.util.ArrayList;
 @MediumTest
 @RunWith(AndroidJUnit4.class)
 public class HorizontalScrollViewTest {
-    private static final int ITEM_WIDTH  = 250;
-    private static final int ITEM_HEIGHT = 100;
+    private static final int ITEM_WIDTH  = 500;
+    private static final int ITEM_HEIGHT = 200;
     private static final int ITEM_COUNT  = 15;
-    private static final int PAGE_WIDTH  = 100;
-    private static final int PAGE_HEIGHT = 100;
+    private static final int PAGE_WIDTH  = 200;
+    private static final int PAGE_HEIGHT = 200;
     private static final int SCROLL_RIGHT = ITEM_WIDTH * ITEM_COUNT - PAGE_WIDTH;
 
     private Instrumentation mInstrumentation;