no more emoji pane fragment

Fixes #3271
Closes #3280

// FREEBIE
This commit is contained in:
Jake McGinty
2015-05-29 10:54:59 -07:00
committed by Moxie Marlinspike
parent e130d0a3e6
commit ce610e0262
6 changed files with 87 additions and 68 deletions

View File

@@ -139,8 +139,10 @@
</LinearLayout>
</RelativeLayout>
<FrameLayout android:id="@+id/emoji_drawer"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<ViewStub android:id="@+id/emoji_drawer_stub"
android:inflatedId="@+id/emoji_drawer"
android:layout="@layout/emoji_drawer_stub"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>

View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<org.thoughtcrime.securesms.components.emoji.EmojiDrawer
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1.1" />