aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2016-03-08 22:24:47 +0100
committerlookshe <github@lookshe.org>2016-03-08 22:24:47 +0100
commita6442dd3ac1114807d9a50892388a8bd4e69a861 (patch)
tree17256a8e21938932f44130c0a0131b8314d5f260 /src/main/res
parentb0e651aa93b56dd1ee50fa5cc6d55eb9ba20b81b (diff)
parent4b4ba6cff85c0bc80fa354a70d7b35b4cef9a672 (diff)
Merge branch 'trz/rename' into trz/rebase
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/layout/message_received.xml2
-rw-r--r--src/main/res/layout/message_sent.xml2
2 files changed, 0 insertions, 4 deletions
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 93ab095b..fa690872 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -54,9 +54,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:autoLink="web|phone|email"
- android:textColorLink="@color/primaryText"
android:textColor="@color/primaryText"
- android:textColorHighlight="@color/grey500"
android:textSize="?attr/TextSizeBody"
app:emojiconSize="28sp" />
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 909ae9c7..b74347d4 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -54,9 +54,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:autoLink="web|phone|email"
- android:textColorLink="@color/primaryText"
android:textColor="@color/primaryText"
- android:textColorHighlight="@color/grey500"
android:textSize="?attr/TextSizeBody"
app:emojiconSize="28sp"/>