fix composition bar disappearing

Closes #3846
// FREEBIE
This commit is contained in:
Jake McGinty 2015-07-30 13:20:21 -07:00 committed by Moxie Marlinspike
parent 964171b26a
commit b5318ed248

View File

@ -27,13 +27,7 @@
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1" /> android:layout_weight="1" />
<LinearLayout android:id="@+id/bottom_container" <FrameLayout android:id="@+id/attachment_editor"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<FrameLayout
android:id="@+id/attachment_editor"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
@ -60,6 +54,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:clickable="true"
android:padding="5dp"> android:padding="5dp">
<LinearLayout android:id="@+id/compose_bubble" <LinearLayout android:id="@+id/compose_bubble"
@ -106,8 +101,7 @@
android:background="@drawable/circle_tintable" android:background="@drawable/circle_tintable"
android:layout_gravity="bottom"> android:layout_gravity="bottom">
<ImageButton <ImageButton android:id="@+id/attach_button"
android:id="@+id/attach_button"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center" android:layout_gravity="center"
@ -143,12 +137,12 @@
android:visibility="gone" android:visibility="gone"
android:text="160/160 (1)" /> android:text="160/160 (1)" />
</LinearLayout>
<org.thoughtcrime.securesms.components.emoji.EmojiDrawer <org.thoughtcrime.securesms.components.emoji.EmojiDrawer
android:id="@+id/emoji_drawer" android:id="@+id/emoji_drawer"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
android:visibility="gone" />
</LinearLayout> </LinearLayout>
</org.thoughtcrime.securesms.components.camera.QuickAttachmentDrawer> </org.thoughtcrime.securesms.components.camera.QuickAttachmentDrawer>