Snap for 6611069 from bf37f463d7f444fe4823675fdd50cdb5a5698a42 to mainline-releaser_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r4android-mainline-11.0.0_r33android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r10android-mainline-11.0.0_r1android11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-release

Change-Id: I1a04687a18bc5d3cdc4fd958218a9ce57a2c2105

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;
 
 /**