Merge "Fix name in user info dialog is cut off when keyboard shown."

        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>

    <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"

    <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>