Make scroll fragment more challenging. am: 1a52e04b27android-mainline-12.0.0_r112android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseaml_tz2_305400100

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/tests/+/11874584

Change-Id: I0145cd03d04c63195e67633a61e65ad7f2a32070

4 files changed, 25 insertions, 8 deletions

diff --git a/RotaryPlayground/res/layout/rotary_activity.xml b/RotaryPlayground/res/layout/rotary_activity.xml
index 7086cb8..2a3b9e7 100644
--- a/RotaryPlayground/res/layout/rotary_activity.xml
+++ b/RotaryPlayground/res/layout/rotary_activity.xml
@@ -26,8 +26,8 @@
          highlight is disabled, so it's invisible to the user no matter whether it's focused or not.
          -->
     <com.android.car.ui.FocusParkingView
-        android:layout_width="1dp"
-        android:layout_height="1dp"/>
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
 
     <FrameLayout
         android:id="@+id/rotary_menu"
diff --git a/RotaryPlayground/res/layout/rotary_scroll.xml b/RotaryPlayground/res/layout/rotary_scroll.xml
index 78c90c0..4153ca1 100644
--- a/RotaryPlayground/res/layout/rotary_scroll.xml
+++ b/RotaryPlayground/res/layout/rotary_scroll.xml
@@ -18,10 +18,23 @@
 <com.android.car.ui.FocusArea
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:singleLine="true"/>
 
     <com.android.car.ui.recyclerview.CarUiRecyclerView
         android:id="@+id/rotary_scroll_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:singleLine="true"/>
+
 </com.android.car.ui.FocusArea>
diff --git a/RotaryPlayground/res/values/arrays.xml b/RotaryPlayground/res/values/arrays.xml
index 18b0015..6c68e6e 100644
--- a/RotaryPlayground/res/values/arrays.xml
+++ b/RotaryPlayground/res/values/arrays.xml
@@ -44,6 +44,7 @@
          height. Items here with '0' indicates the buttons item and items with value > 0 indicates
          the text item where the integer value is the height of the textview. -->
     <integer-array name="scroll_item_heights">
+        <item>240</item>
         <item>0</item>
         <item>60</item>
         <item>0</item>
@@ -64,6 +65,10 @@
         <item>0</item>
         <item>240</item>
         <item>240</item>
+        <item>240</item>
         <item>0</item>
+        <item>240</item>
+        <item>240</item>
+        <item>240</item>
     </integer-array>
 </resources>
\ No newline at end of file
diff --git a/RotaryPlayground/src/com/android/car/rotaryplayground/RotaryActivity.java b/RotaryPlayground/src/com/android/car/rotaryplayground/RotaryActivity.java
index 32ab6a5..eada0cf 100644
--- a/RotaryPlayground/src/com/android/car/rotaryplayground/RotaryActivity.java
+++ b/RotaryPlayground/src/com/android/car/rotaryplayground/RotaryActivity.java
@@ -16,14 +16,13 @@
 package com.android.car.rotaryplayground;
 
 import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import android.text.Html;
-import android.text.Spanned;
 import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+
 import java.util.Random;
 
 /**