From e8ff1a04ed5e70eb267f8ee5334a1052f5a4f59b Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Wed, 15 Feb 2023 14:46:46 -0500
Subject: [PATCH] Fix scrolling issue in transfer lock dialog for small
 displays.

---
 .../OldDeviceTransferLockedDialog.java        |  2 +-
 ...device_transfer_locked_dialog_fragment.xml | 56 +++++++++++--------
 2 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/olddevice/OldDeviceTransferLockedDialog.java b/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/olddevice/OldDeviceTransferLockedDialog.java
index 6c7e11e52..ad9dee7e9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/olddevice/OldDeviceTransferLockedDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/olddevice/OldDeviceTransferLockedDialog.java
@@ -41,7 +41,7 @@ public final class OldDeviceTransferLockedDialog extends DialogFragment {
 
   @Override
   public Dialog onCreateDialog(Bundle savedInstanceState) {
-    MaterialAlertDialogBuilder dialogBuilder = new MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_Signal_MaterialAlertDialog);
+    MaterialAlertDialogBuilder dialogBuilder = new MaterialAlertDialogBuilder(requireContext());
     dialogBuilder.setView(R.layout.old_device_transfer_locked_dialog_fragment)
                  .setPositiveButton(R.string.OldDeviceTransferLockedDialog__done, (d, w) -> OldDeviceExitActivity.exit(requireActivity()))
                  .setNegativeButton(R.string.OldDeviceTransferLockedDialog__cancel_and_activate_this_device, (d, w) -> onUnlockRequest());
diff --git a/app/src/main/res/layout/old_device_transfer_locked_dialog_fragment.xml b/app/src/main/res/layout/old_device_transfer_locked_dialog_fragment.xml
index 4225e7acd..38eb0751e 100644
--- a/app/src/main/res/layout/old_device_transfer_locked_dialog_fragment.xml
+++ b/app/src/main/res/layout/old_device_transfer_locked_dialog_fragment.xml
@@ -1,32 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:viewBindingIgnore="true"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_gravity="center_horizontal"
-    android:orientation="vertical"
-    android:padding="?attr/dialogPreferredPadding">
+    android:fillViewport="true"
+    android:scrollbarAlwaysDrawVerticalTrack="true"
+    tools:viewBindingIgnore="true">
 
-    <androidx.appcompat.widget.AppCompatImageView
+    <LinearLayout
         android:layout_width="wrap_content"
-        android:layout_height="120dp"
-        android:layout_gravity="center"
-        app:srcCompat="@drawable/ic_complete_reg" />
-
-    <TextView
-        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="16dp"
-        android:text="@string/OldDeviceTransferLockedDialog__complete_registration_on_your_new_device"
-        android:textAppearance="@style/TextAppearance.Signal.Title2" />
+        android:layout_gravity="center_horizontal"
+        android:orientation="vertical"
+        android:padding="?attr/dialogPreferredPadding">
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/OldDeviceTransferLockedDialog__your_signal_account_has_been_transferred_to_your_new_device"
-        android:textAppearance="@style/TextAppearance.Signal.Body1" />
+        <androidx.appcompat.widget.AppCompatImageView
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            app:srcCompat="@drawable/ic_complete_reg" />
 
-</LinearLayout>
\ No newline at end of file
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="16dp"
+            android:text="@string/OldDeviceTransferLockedDialog__complete_registration_on_your_new_device"
+            android:textAppearance="@style/TextAppearance.Signal.Title2" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/OldDeviceTransferLockedDialog__your_signal_account_has_been_transferred_to_your_new_device"
+            android:textAppearance="@style/TextAppearance.Signal.Body1" />
+
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file