From 22789476124b4f880d9ebf0bafde400e6cb3faed Mon Sep 17 00:00:00 2001
From: Yasin Kilicdere <tyk@google.com>
Date: Thu, 3 Feb 2022 01:00:44 +0000
Subject: [PATCH] Fix name in user info dialog is cut off when keyboard shown.

Bug: 217271948
Test: Visual
Change-Id: I9615194f7494262161d5aa09bf67ba8e3b299cc0
---
 .../res/layout/edit_user_info_dialog_content.xml       | 10 +++++-----
 packages/SettingsLib/res/values/dimens.xml             |  5 +++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/SettingsLib/res/layout/edit_user_info_dialog_content.xml b/packages/SettingsLib/res/layout/edit_user_info_dialog_content.xml
index c8ddcc870e460..6940c39d6617f 100644
--- a/packages/SettingsLib/res/layout/edit_user_info_dialog_content.xml
+++ b/packages/SettingsLib/res/layout/edit_user_info_dialog_content.xml
@@ -27,14 +27,14 @@
         android:layout_gravity="center">
         <ImageView
             android:id="@+id/user_photo"
-            android:layout_width="@dimen/user_photo_size_in_profile_info_dialog"
-            android:layout_height="@dimen/user_photo_size_in_profile_info_dialog"
+            android:layout_width="@dimen/user_photo_size_in_user_info_dialog"
+            android:layout_height="@dimen/user_photo_size_in_user_info_dialog"
             android:contentDescription="@string/user_image_photo_selector"
             android:scaleType="fitCenter"/>
         <ImageView
             android:id="@+id/add_a_photo_icon"
-            android:layout_width="@dimen/add_a_photo_icon_size_in_profile_info_dialog"
-            android:layout_height="@dimen/add_a_photo_icon_size_in_profile_info_dialog"
+            android:layout_width="@dimen/add_a_photo_icon_size_in_user_info_dialog"
+            android:layout_height="@dimen/add_a_photo_icon_size_in_user_info_dialog"
             android:src="@drawable/add_a_photo_circled"
             android:layout_gravity="bottom|right" />
     </FrameLayout>
@@ -42,7 +42,7 @@
     <EditText
         android:id="@+id/user_name"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/user_name_height_in_user_info_dialog"
         android:layout_gravity="center"
         android:minWidth="200dp"
         android:layout_marginStart="6dp"
diff --git a/packages/SettingsLib/res/values/dimens.xml b/packages/SettingsLib/res/values/dimens.xml
index 120df76218b37..e1bd9f705577d 100644
--- a/packages/SettingsLib/res/values/dimens.xml
+++ b/packages/SettingsLib/res/values/dimens.xml
@@ -99,8 +99,9 @@
     <dimen name="update_user_photo_popup_min_width">300dp</dimen>
 
     <dimen name="add_a_photo_circled_padding">6dp</dimen>
-    <dimen name="user_photo_size_in_profile_info_dialog">112dp</dimen>
-    <dimen name="add_a_photo_icon_size_in_profile_info_dialog">32dp</dimen>
+    <dimen name="user_photo_size_in_user_info_dialog">112dp</dimen>
+    <dimen name="add_a_photo_icon_size_in_user_info_dialog">32dp</dimen>
+    <dimen name="user_name_height_in_user_info_dialog">48sp</dimen>
 
     <integer name="avatar_picker_columns">3</integer>
     <dimen name="avatar_size_in_picker">96dp</dimen>