diff options
| author | lookshe <github@lookshe.org> | 2016-03-20 16:15:43 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-20 16:15:43 +0100 |
| commit | d1e2023bd9b64d405af9648635ca17f0a7ff1010 (patch) | |
| tree | 26741b1cd11ba167ec06b163738d9b7097ef76d9 /src/main/res/values | |
| parent | 50dad467eeb63e767777733e9b280864f16e81f7 (diff) | |
| parent | 90bbe035e9efdff72241c8a0d87000fdba482a6b (diff) | |
Merge branch 'trz/rename' into trz/rebase
Diffstat (limited to 'src/main/res/values')
| -rw-r--r-- | src/main/res/values/attrs.xml | 3 | ||||
| -rw-r--r-- | src/main/res/values/themes.xml | 4 |
2 files changed, 7 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"/> diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 0f8b95bb..67e0a5ee 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -9,6 +9,9 @@ <item name="TextSizeBody">14sp</item> <item name="TextSizeHeadline">20sp</item> + <item name="EmojiconSizeBody">19sp</item> + <item name="EmojiconSizeInput">24sp</item> + <item name="attr/icon_add_group">@drawable/ic_action_add_group</item> <item name="attr/icon_add_person">@drawable/ic_action_add_person</item> <item name="attr/icon_cancel">@drawable/ic_action_cancel</item> @@ -36,6 +39,7 @@ <item name="TextSizeInfo">14sp</item> <item name="TextSizeBody">16sp</item> <item name="TextSizeHeadline">22sp</item> + <item name="EmojiconSizeBody">22sp</item> </style> <style name="ConversationsActionBar" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse"> |