aboutsummaryrefslogtreecommitdiffstats
path: root/libs/emojicon/src/main/res/values/attrs.xml
diff options
context:
space:
mode:
Diffstat (limited to 'libs/emojicon/src/main/res/values/attrs.xml')
-rw-r--r--libs/emojicon/src/main/res/values/attrs.xml30
1 files changed, 11 insertions, 19 deletions
diff --git a/libs/emojicon/src/main/res/values/attrs.xml b/libs/emojicon/src/main/res/values/attrs.xml
index 9810158d..30e8aed5 100644
--- a/libs/emojicon/src/main/res/values/attrs.xml
+++ b/libs/emojicon/src/main/res/values/attrs.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright 2014 Ankush Sachdeva
+ ~ Copyright 2014 Hieu Rocker
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,27 +13,19 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
--->
+ -->
<resources>
-
<declare-styleable name="Emojicon">
- <attr name="emojiconSize" format="dimension" />
- <attr name="emojiconTextStart" format="integer" />
- <attr name="emojiconTextLength" format="integer" />
+ <attr name="emojiconSize" format="dimension"/>
+ <attr name="emojiconAlignment" format="enum">
+ <enum name="bottom" value="0"/>
+ <enum name="baseline" value="1"/>
+ </attr>
+ <attr name="emojiconTextStart" format="integer"/>
+ <attr name="emojiconTextLength" format="integer"/>
+ <attr name="emojiconUseSystemDefault" format="boolean"/>
</declare-styleable>
<dimen name="keyboard_height">250dp</dimen>
-
- <style name="emojiDialog" parent="@android:style/Theme.Dialog">
- <item name="android:layout_width">fill_parent</item>
- <item name="android:layout_height">fill_parent</item>
-
- <!-- No backgrounds, titles or window float -->
- <item name="android:windowFrame">@null</item>
- <item name="android:windowBackground">@null</item>
- <item name="android:windowNoTitle">true</item>
- <item name="android:windowIsFloating">false</item>
- </style>
-
-</resources> \ No newline at end of file
+</resources>