Merge "Apply scrollable to app pinning text area" am: 7f3a7daaf5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537210

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa70f235fc1cadd5cb4441de61d4b03f645b6504

1 files changed, 61 insertions, 54 deletions

diff --git a/packages/SystemUI/res/layout/screen_pinning_request_text_area.xml b/packages/SystemUI/res/layout/screen_pinning_request_text_area.xml
index 8dcddc28c3b7..7880cbdd112c 100644
--- a/packages/SystemUI/res/layout/screen_pinning_request_text_area.xml
+++ b/packages/SystemUI/res/layout/screen_pinning_request_text_area.xml
@@ -16,65 +16,72 @@
  * limitations under the License.
  */
 -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/screen_pinning_text_area"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="?android:attr/colorAccent"
-    android:gravity="center_vertical">
+    android:fillViewport="true">
 
-    <TextView
-        android:id="@+id/screen_pinning_title"
-        android:layout_width="match_parent"
+    <RelativeLayout
+        android:id="@+id/screen_pinning_text_area"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingEnd="48dp"
-        android:paddingStart="48dp"
-        android:paddingTop="43dp"
-        android:text="@string/screen_pinning_title"
-        android:textColor="@android:color/white"
-        android:textSize="24sp" />
+        android:background="?android:attr/colorAccent"
+        android:gravity="center_vertical">
 
-    <TextView
-        android:id="@+id/screen_pinning_description"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/screen_pinning_title"
-        android:paddingEnd="48dp"
-        android:paddingStart="48dp"
-        android:paddingTop="12.6dp"
-        android:text="@string/screen_pinning_description"
-        android:textColor="@android:color/white"
-        android:textSize="16sp" />
+        <TextView
+            android:id="@+id/screen_pinning_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingEnd="48dp"
+            android:paddingStart="48dp"
+            android:paddingTop="43dp"
+            android:text="@string/screen_pinning_title"
+            android:textColor="@android:color/white"
+            android:textSize="24sp" />
 
-    <Button
-        android:id="@+id/screen_pinning_ok_button"
-        style="@android:style/Widget.Material.Button"
-        android:layout_width="wrap_content"
-        android:layout_height="36dp"
-        android:layout_alignParentEnd="true"
-        android:layout_below="@+id/screen_pinning_description"
-        android:layout_marginEnd="40dp"
-        android:layout_marginTop="18dp"
-        android:background="@null"
-        android:paddingEnd="8dp"
-        android:paddingStart="8dp"
-        android:text="@string/screen_pinning_positive"
-        android:textColor="@android:color/white"
-        android:textSize="14sp" />
+        <TextView
+            android:id="@+id/screen_pinning_description"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/screen_pinning_title"
+            android:paddingEnd="48dp"
+            android:paddingStart="48dp"
+            android:paddingTop="12.6dp"
+            android:text="@string/screen_pinning_description"
+            android:textColor="@android:color/white"
+            android:textSize="16sp" />
 
-    <Button
-        android:id="@+id/screen_pinning_cancel_button"
-        style="@android:style/Widget.Material.Button"
-        android:layout_width="wrap_content"
-        android:layout_height="36dp"
-        android:layout_alignTop="@id/screen_pinning_ok_button"
-        android:layout_marginEnd="4dp"
-        android:layout_toStartOf="@id/screen_pinning_ok_button"
-        android:background="@null"
-        android:paddingEnd="8dp"
-        android:paddingStart="8dp"
-        android:text="@string/screen_pinning_negative"
-        android:textColor="@android:color/white"
-        android:textSize="14sp" />
+        <Button
+            android:id="@+id/screen_pinning_ok_button"
+            style="@android:style/Widget.Material.Button"
+            android:layout_width="wrap_content"
+            android:layout_height="36dp"
+            android:layout_alignParentEnd="true"
+            android:layout_below="@+id/screen_pinning_description"
+            android:layout_marginEnd="40dp"
+            android:layout_marginTop="18dp"
+            android:background="@null"
+            android:paddingEnd="8dp"
+            android:paddingStart="8dp"
+            android:text="@string/screen_pinning_positive"
+            android:textColor="@android:color/white"
+            android:textSize="14sp" />
+
+        <Button
+            android:id="@+id/screen_pinning_cancel_button"
+            style="@android:style/Widget.Material.Button"
+            android:layout_width="wrap_content"
+            android:layout_height="36dp"
+            android:layout_alignTop="@id/screen_pinning_ok_button"
+            android:layout_marginEnd="4dp"
+            android:layout_toStartOf="@id/screen_pinning_ok_button"
+            android:background="@null"
+            android:paddingEnd="8dp"
+            android:paddingStart="8dp"
+            android:text="@string/screen_pinning_negative"
+            android:textColor="@android:color/white"
+            android:textSize="14sp" />
+
+    </RelativeLayout>
 
-</RelativeLayout>
+</ScrollView>