aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-10-01 08:12:11 +0200
committerChristian Schneppe <christian@pix-art.de>2018-10-01 08:12:11 +0200
commit36033690b4c6f8b702cd77074cb7a74d0dcde5ca (patch)
treecf44ff7fa7fedaaa0a73cf91e9f6296679116486 /src/main/res
parent092926db0bdf298bb99b41ab67305c34aa960469 (diff)
fix crashes with EmojiTextView
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/layout/ab_title.xml4
-rw-r--r--src/main/res/layout/activity_contact_details.xml6
-rw-r--r--src/main/res/layout/activity_muc_details.xml2
-rw-r--r--src/main/res/layout/contact.xml2
4 files changed, 7 insertions, 7 deletions
diff --git a/src/main/res/layout/ab_title.xml b/src/main/res/layout/ab_title.xml
index a20e9f8bc..79c9d61f7 100644
--- a/src/main/res/layout/ab_title.xml
+++ b/src/main/res/layout/ab_title.xml
@@ -5,7 +5,7 @@
android:layout_height="match_parent"
android:gravity="start|center_vertical">
- <android.support.text.emoji.widget.EmojiTextView
+ <TextView
android:id="@android:id/text1"
style="@style/Base.TextAppearance.AppCompat.Widget.ActionBar.Title"
android:layout_width="match_parent"
@@ -19,7 +19,7 @@
android:onClick="onClick"
android:paddingTop="1dp" />
- <android.support.text.emoji.widget.EmojiTextView
+ <TextView
android:id="@android:id/text2"
style="@style/Base.TextAppearance.AppCompat.Widget.ActionBar.Subtitle"
android:layout_width="match_parent"
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 268071fbd..ff2da6710 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -43,7 +43,7 @@
android:orientation="vertical"
android:padding="@dimen/card_padding_regular">
- <android.support.text.emoji.widget.EmojiTextView
+ <TextView
android:id="@+id/contact_display_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -114,7 +114,7 @@
android:layout_marginTop="4dp"
android:textAppearance="@style/TextAppearance.Conversations.Subhead" />
- <android.support.text.emoji.widget.EmojiTextView
+ <TextView
android:id="@+id/status_message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -124,7 +124,7 @@
android:gravity="center_horizontal"
android:textAppearance="@style/TextAppearance.Conversations.Body1" />
- <android.support.text.emoji.widget.EmojiTextView
+ <TextView
android:id="@+id/resource"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index c88afab8d..76659824c 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -373,7 +373,7 @@
android:orientation="vertical"
android:paddingLeft="@dimen/avatar_item_distance">
- <android.support.text.emoji.widget.EmojiTextView
+ <TextView
android:id="@+id/muc_your_nick"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml
index ef020f976..09e0ac9bf 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -25,7 +25,7 @@
android:orientation="vertical"
android:paddingLeft="@dimen/avatar_item_distance">
- <android.support.text.emoji.widget.EmojiTextView
+ <TextView
android:id="@+id/contact_display_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"