From 2746c6015e4b9035973987d362464eaf32b2c761 Mon Sep 17 00:00:00 2001
From: Angela Wang <angelala@google.com>
Date: Thu, 27 Jun 2024 10:28:10 +0000
Subject: [PATCH] Fix text cropping in pairing dialog

Eliminated child view margins, which were causing incorrect content height calculation within the parent ScrollView. Added padding to ScrollView to maintain visual spacing and ensure all text is visible.

Bug: 328519578
Test: manually, attach screenshots in bug
Flag: EXEMPT bugfix
Change-Id: If31c8a9b491ca3bee834ba470dbc1ec4e8a5e9bc
---
 res/layout/bluetooth_pin_confirm.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/res/layout/bluetooth_pin_confirm.xml b/res/layout/bluetooth_pin_confirm.xml
index fb3435bf342..9387d5ddd82 100644
--- a/res/layout/bluetooth_pin_confirm.xml
+++ b/res/layout/bluetooth_pin_confirm.xml
@@ -20,13 +20,13 @@
 <ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
-    android:layout_width="match_parent">
+    android:layout_width="match_parent"
+    android:paddingTop="@dimen/bluetooth_dialog_padding_top">
 
     <LinearLayout
         android:paddingStart="16dip"
         android:layout_height="match_parent"
         android:layout_width="match_parent"
-        android:layout_marginTop="@dimen/bluetooth_dialog_padding_top"
         android:orientation="vertical">
 
         <TextView
@@ -85,7 +85,7 @@
             android:orientation="horizontal">
             <LinearLayout
                 android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_marginEnd="10dp"
                 android:orientation="vertical">
@@ -105,7 +105,6 @@
                 android:id="@+id/phonebook_sharing_message_confirm_pin"
                 android:layout_width="wrap_content"
                 android:layout_height="48dp"
-                android:layout_weight="0"
                 android:gravity="center_vertical"
                 android:contentDescription="@string/bluetooth_pairing_phonebook_toggle_text"
                 android:switchMinWidth="48dp" />