diff options
| -rw-r--r-- | res/layout/compose_recipients.xml | 44 | ||||
| -rw-r--r-- | res/values-ldrtl/styles-ldrtl.xml | 4 | ||||
| -rw-r--r-- | res/values/styles.xml | 4 |
3 files changed, 38 insertions, 14 deletions
diff --git a/res/layout/compose_recipients.xml b/res/layout/compose_recipients.xml index b265318f5..3c3a0e4b4 100644 --- a/res/layout/compose_recipients.xml +++ b/res/layout/compose_recipients.xml @@ -39,21 +39,37 @@ style="@style/ComposeHeading" /> <LinearLayout - android:id="@+id/compose_to_dropdown_anchor" android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <com.android.ex.chips.RecipientEditTextView - android:id="@+id/to" - android:contentDescription="@string/to" - android:dropDownAnchor="@id/to_content" - style="@style/ToRecipientEditTextViewStyle" /> - - <ImageView - android:id="@+id/add_cc_bcc" - android:src="@drawable/ic_expand_more_24dp" - android:contentDescription="@string/add_cc_label" - style="@style/ComposeFieldButton" /> + android:layout_height="wrap_content" + android:orientation="vertical"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <com.android.ex.chips.RecipientEditTextView + android:id="@+id/to" + android:contentDescription="@string/to" + android:dropDownAnchor="@id/to_content" + style="@style/ToRecipientEditTextViewStyle" /> + + <ImageView + android:id="@+id/add_cc_bcc" + android:src="@drawable/ic_expand_more_24dp" + android:contentDescription="@string/add_cc_label" + style="@style/ComposeFieldButton" /> + + </LinearLayout> + + <!-- + 0dp high space just so the anchor has appropriate right padding since it was + removed for To field to compensate the show cc/bcc button + --> + <Space + android:id="@+id/compose_to_dropdown_anchor" + android:layout_width="match_parent" + android:layout_height="0dp" + style="@style/ComposeToDropdownAnchor" /> </LinearLayout> diff --git a/res/values-ldrtl/styles-ldrtl.xml b/res/values-ldrtl/styles-ldrtl.xml index 93c9ea771..6416c5111 100644 --- a/res/values-ldrtl/styles-ldrtl.xml +++ b/res/values-ldrtl/styles-ldrtl.xml @@ -362,6 +362,10 @@ <item name="android:paddingEnd">@dimen/compose_content_end_padding</item> </style> + <style name="ComposeToDropdownAnchor"> + <item name="android:layout_marginEnd">@dimen/compose_content_end_padding</item> + </style> + <style name="ComposeFieldButton" parent="@style/BaseComposeFieldButton"> <item name="android:layout_marginStart">@dimen/compose_header_btn_padding</item> </style> diff --git a/res/values/styles.xml b/res/values/styles.xml index 91820d08b..20da0c234 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -112,6 +112,10 @@ <item name="android:paddingRight">@dimen/compose_content_end_padding</item> </style> + <style name="ComposeToDropdownAnchor"> + <item name="android:layout_marginRight">@dimen/compose_content_end_padding</item> + </style> + <style name="BaseComposeFieldButton"> <item name="android:layout_width">56dp</item> <item name="android:layout_height">@dimen/compose_header_min_height</item> |