aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values/attrs.xml
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2016-03-20 16:15:43 +0100
committerlookshe <github@lookshe.org>2016-03-20 16:15:43 +0100
commitd1e2023bd9b64d405af9648635ca17f0a7ff1010 (patch)
tree26741b1cd11ba167ec06b163738d9b7097ef76d9 /src/main/res/values/attrs.xml
parent50dad467eeb63e767777733e9b280864f16e81f7 (diff)
parent90bbe035e9efdff72241c8a0d87000fdba482a6b (diff)
Merge branch 'trz/rename' into trz/rebase
Diffstat (limited to '')
-rw-r--r--src/main/res/values/attrs.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 0d6d19b1..2cad436c 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -5,6 +5,9 @@
<attr name="TextSizeBody" format="dimension" />
<attr name="TextSizeHeadline" format="dimension" />
+ <attr name="EmojiconSizeBody" format="dimension" />
+ <attr name="EmojiconSizeInput" format="dimension" />
+
<attr name="icon_add_group" format="reference"/>
<attr name="icon_add_person" format="reference"/>
<attr name="icon_cancel" format="reference"/>