diff options
| author | lookshe <github@lookshe.org> | 2015-10-05 13:55:43 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2015-10-05 13:55:43 +0200 |
| commit | b98478e57c088efc63fd470e429f791dd664707a (patch) | |
| tree | e722ed48ee2ec125d8ad9250f79d8e1ca95666a7 /src/main/res/layout/message_sent.xml | |
| parent | 5850cbcf9c3e72580f3288c582737a04e8148b79 (diff) | |
| parent | 6f17b06ad008cc7ac89174ba7ac7cc96ee0881eb (diff) | |
Merge branch 'trz/rename' into trz/rebase
Conflicts:
build.gradle
src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
Diffstat (limited to 'src/main/res/layout/message_sent.xml')
| -rw-r--r-- | src/main/res/layout/message_sent.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml index 563e2e29..3b8212a5 100644 --- a/src/main/res/layout/message_sent.xml +++ b/src/main/res/layout/message_sent.xml @@ -44,7 +44,7 @@ android:id="@+id/message_body" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:autoLink="web" + android:autoLink="web|phone|email" android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" emojicon:emojiconSize="28sp" /> |