TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-26 11:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

stop using PopupWindow for emoji. too many android bugs.

Browse Source 
Closes #3655
// FREEBIE
This commit is contained in:
Jake McGinty
2015-07-13 15:45:14 -07:00
committed by Moxie Marlinspike
parent c7599094f5
commit b519fd2533
7 changed files with 85 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
res/layout/conversation_activity.xml
View File

@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/layout_container"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
<org.thoughtcrime.securesms.components.camera.QuickAttachmentDrawer
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/quick_attachment_drawer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black">
<org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout
android:id="@+id/layout_container"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
<RelativeLayout android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1"
@@ -159,6 +159,11 @@
</LinearLayout>
</RelativeLayout>
</org.thoughtcrime.securesms.components.camera.QuickAttachmentDrawer>
<ViewStub android:id="@+id/emoji_drawer_stub"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inflatedId="@+id/emoji_drawer"
android:layout="@layout/emoji_drawer_stub" />
</org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout>
</org.thoughtcrime.securesms.components.camera.QuickAttachmentDrawer>

10
res/layout/emoji_drawer.xml
View File

@@ -1,11 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/container"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout android:background="?emoji_tab_strip_background"
android:orientation="horizontal"
@@ -47,4 +43,4 @@
android:layout_height="match_parent"
android:background="?emoji_background" />
</LinearLayout>
</merge>