From d9d3325cc5df6524c58b4d48b5a9b86431e8b672 Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Tue, 8 Dec 2020 20:22:37 +0100
Subject: [PATCH] EN: Add scrolling to confirmation dialog

Useful for small screen + large font devices
---
 ...xposure_notifications_confirm_activity.xml | 120 ++++++++++--------
 1 file changed, 66 insertions(+), 54 deletions(-)

diff --git a/play-services-nearby-core-ui/src/main/res/layout/exposure_notifications_confirm_activity.xml b/play-services-nearby-core-ui/src/main/res/layout/exposure_notifications_confirm_activity.xml
index 574b3b1e..cdad35f2 100644
--- a/play-services-nearby-core-ui/src/main/res/layout/exposure_notifications_confirm_activity.xml
+++ b/play-services-nearby-core-ui/src/main/res/layout/exposure_notifications_confirm_activity.xml
@@ -23,65 +23,77 @@
         android:textColor="?android:attr/textColorPrimary"
         tools:text="@string/exposure_confirm_start_title" />
 
-    <TextView
-        android:id="@android:id/summary"
-        style="@style/TextAppearance.AppCompat.Small"
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="16dp"
-        tools:text="Your phone needs to use Bluetooth to securely collect and share IDs with other phones that are nearby.\n\nCorona Warn can notify you if you were exposed to someone who reported to be diagnosed positive.\n\nThe date, duration, and signal strength associated with an exposure will be shared with the app." />
+        android:layout_height="wrap_content">
 
-    <LinearLayout
-        android:id="@+id/grant_permission_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:background="?attr/colorAccent"
-        android:clipToPadding="false"
-        android:padding="16dp"
-        android:visibility="gone"
-        tools:visibility="visible">
-
-        <TextView
-            android:id="@+id/grant_permission_summary"
-            style="@style/TextAppearance.AppCompat.Small.Inverse"
-            android:layout_width="0dip"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/exposure_confirm_permission_description" />
+            android:animateLayoutChanges="true"
+            android:orientation="vertical">
 
-        <Button
-            android:id="@+id/grant_permission_button"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginRight="-8dp"
-            android:text="@string/exposure_confirm_permission_button"
-            android:textColor="?android:attr/textColorPrimaryInverse" />
-    </LinearLayout>
+            <TextView
+                android:id="@android:id/summary"
+                style="@style/TextAppearance.AppCompat.Small"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="16dp"
+                tools:text="Your phonre needs to use Bluetooth to securely collect and share IDs with other phones that are nearby.\n\nCorona Warn can notify you if you were exposed to someone who reported to be diagnosed positive.\n\nThe date, duration, and signal strength associated with an exposure will be shared with the app." />
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="end"
-        android:paddingLeft="8dp"
-        android:paddingTop="0dp"
-        android:paddingRight="8dp"
-        android:paddingBottom="8dp">
+            <LinearLayout
+                android:id="@+id/grant_permission_view"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="8dp"
+                android:background="?attr/colorAccent"
+                android:clipToPadding="false"
+                android:visibility="gone"
+                tools:visibility="visible">
 
-        <Button
-            android:id="@android:id/button2"
-            style="@style/Widget.AppCompat.Button.Borderless.Colored"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@android:string/cancel" />
+                <TextView
+                    android:id="@+id/grant_permission_summary"
+                    style="@style/TextAppearance.AppCompat.Small.Inverse"
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:padding="16dp"
+                    android:text="@string/exposure_confirm_permission_description" />
 
-        <Button
-            android:id="@android:id/button1"
-            style="@style/Widget.AppCompat.Button.Borderless.Colored"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@android:string/ok" />
-    </LinearLayout>
+                <Button
+                    android:id="@+id/grant_permission_button"
+                    style="@style/Widget.AppCompat.Button.Borderless"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:padding="16dp"
+                    android:text="@string/exposure_confirm_permission_button"
+                    android:textColor="?android:attr/textColorPrimaryInverse" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="end"
+                android:paddingLeft="8dp"
+                android:paddingTop="0dp"
+                android:paddingRight="8dp"
+                android:paddingBottom="8dp">
+
+                <Button
+                    android:id="@android:id/button2"
+                    style="@style/Widget.AppCompat.Button.Borderless.Colored"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@android:string/cancel" />
+
+                <Button
+                    android:id="@android:id/button1"
+                    style="@style/Widget.AppCompat.Button.Borderless.Colored"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@android:string/ok" />
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
 </LinearLayout>