Merge branch 'master' into import_export_keywords
This commit is contained in:
commit
025a3a2729
127 changed files with 4238 additions and 235 deletions
|
|
@ -13,9 +13,9 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingStart="@dimen/small_margin"
|
||||
android:paddingTop="@dimen/activity_margin"
|
||||
android:paddingTop="@dimen/medium_margin"
|
||||
android:paddingEnd="@dimen/normal_margin"
|
||||
android:paddingBottom="@dimen/activity_margin">
|
||||
android:paddingBottom="@dimen/medium_margin">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/conversation_image"
|
||||
|
|
|
|||
|
|
@ -112,6 +112,7 @@
|
|||
android:hint="@string/type_a_message"
|
||||
android:inputType="textCapSentences|textMultiLine"
|
||||
android:minHeight="@dimen/normal_icon_size"
|
||||
android:maxLines="8"
|
||||
app:layout_constraintBottom_toTopOf="@+id/attachment_picker_divider"
|
||||
app:layout_constraintEnd_toStartOf="@id/thread_select_sim_icon"
|
||||
app:layout_constraintStart_toEndOf="@+id/thread_add_attachment" />
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue