nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 3bf2c598: am 1d188a28: Merge "Fix emoji" 

* commit '3bf2c59881ebdd4cf77099806d26f280046623bf':
  Fix emoji
main
Satoshi Kataoka 2013-10-09 18:55:00 -07:00 committed by Android Git Automerger
parent 383da922a6 3bf2c59881
commit f12df9e401
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/res/values-sw600dp-land/dimens.xml
View File

@ -66,7 +66,7 @@
<!-- Emoji keyboard --> <!-- Emoji keyboard -->
<fraction name="emoji_keyboard_key_width">10%p</fraction> <fraction name="emoji_keyboard_key_width">10%p</fraction>
<fraction name="emoji_keyboard_row_height">33%p</fraction> <fraction name="emoji_keyboard_row_height">33%p</fraction>
<fraction name="emoji_keyboard_key_letter_size">85%p</fraction> <fraction name="emoji_keyboard_key_letter_size">70%p</fraction>
<integer name="emoji_keyboard_max_key_count">30</integer> <integer name="emoji_keyboard_max_key_count">30</integer>
</resources> </resources>

2
java/res/values-sw600dp/dimens.xml
View File

@ -92,7 +92,7 @@
<!-- Emoji keyboard --> <!-- Emoji keyboard -->
<fraction name="emoji_keyboard_key_width">12.5%p</fraction> <fraction name="emoji_keyboard_key_width">12.5%p</fraction>
<fraction name="emoji_keyboard_row_height">33%p</fraction> <fraction name="emoji_keyboard_row_height">33%p</fraction>
<fraction name="emoji_keyboard_key_letter_size">76%p</fraction> <fraction name="emoji_keyboard_key_letter_size">60%p</fraction>
<integer name="emoji_keyboard_max_key_count">24</integer> <integer name="emoji_keyboard_max_key_count">24</integer>
</resources> </resources>

2
java/res/values-sw768dp-land/dimens.xml
View File

@ -67,7 +67,7 @@
<!-- Emoji keyboard --> <!-- Emoji keyboard -->
<fraction name="emoji_keyboard_key_width">7.69%p</fraction> <fraction name="emoji_keyboard_key_width">7.69%p</fraction>
<fraction name="emoji_keyboard_row_height">33%p</fraction> <fraction name="emoji_keyboard_row_height">33%p</fraction>
<fraction name="emoji_keyboard_key_letter_size">68%p</fraction> <fraction name="emoji_keyboard_key_letter_size">60%p</fraction>
<integer name="emoji_keyboard_max_key_count">39</integer> <integer name="emoji_keyboard_max_key_count">39</integer>
</resources> </resources>

2
java/res/values-sw768dp/dimens.xml
View File

@ -92,7 +92,7 @@
<!-- Emoji keyboard --> <!-- Emoji keyboard -->
<fraction name="emoji_keyboard_key_width">10%p</fraction> <fraction name="emoji_keyboard_key_width">10%p</fraction>
<fraction name="emoji_keyboard_row_height">33%p</fraction> <fraction name="emoji_keyboard_row_height">33%p</fraction>
<fraction name="emoji_keyboard_key_letter_size">76%p</fraction> <fraction name="emoji_keyboard_key_letter_size">68%p</fraction>
<integer name="emoji_keyboard_max_key_count">30</integer> <integer name="emoji_keyboard_max_key_count">30</integer>
</resources> </resources>

2
java/res/values-v19/emoji-categories.xml
View File

@ -214,7 +214,7 @@
<item>fe835|0038,20e3|99</item> <!-- TODO: fix support min sdk version (99) --> <item>fe835|0038,20e3|99</item> <!-- TODO: fix support min sdk version (99) -->
<item>fe836|0039,20e3|99</item> <!-- TODO: fix support min sdk version (99) --> <item>fe836|0039,20e3|99</item> <!-- TODO: fix support min sdk version (99) -->
<item>fe837|0030,20e3|99</item> <!-- TODO: fix support min sdk version (99) --> <item>fe837|0030,20e3|99</item> <!-- TODO: fix support min sdk version (99) -->
<item>1f51f</item> <item>1f51f||99</item> <!-- TODO: fix support min sdk version (99) -->
<item>fe82c|0023,20e3|99</item> <!-- TODO: fix support min sdk version (99) --> <item>fe82c|0023,20e3|99</item> <!-- TODO: fix support min sdk version (99) -->
<item>1f51d</item> <item>1f51d</item>
<item>1f519</item> <item>1f519</item>

2
java/res/values/dimens.xml
View File

@ -118,7 +118,7 @@
<!-- Emoji keyboard --> <!-- Emoji keyboard -->
<fraction name="emoji_keyboard_key_width">14.2857%p</fraction> <fraction name="emoji_keyboard_key_width">14.2857%p</fraction>
<fraction name="emoji_keyboard_row_height">33%p</fraction> <fraction name="emoji_keyboard_row_height">33%p</fraction>
<fraction name="emoji_keyboard_key_letter_size">81%p</fraction> <fraction name="emoji_keyboard_key_letter_size">68%p</fraction>
<integer name="emoji_keyboard_max_key_count">21</integer> <integer name="emoji_keyboard_max_key_count">21</integer>
<dimen name="emoji_category_page_id_height">3dp</dimen> <dimen name="emoji_category_page_id_height">3dp</dimen>

2
java/src/com/android/inputmethod/keyboard/EmojiLayoutParams.java
View File

@ -56,7 +56,7 @@ public class EmojiLayoutParams {
- (mKeyVerticalGap - mBottomPadding) / 2; - (mKeyVerticalGap - mBottomPadding) / 2;
mEmojiPagerHeight = defaultKeyboardHeight - mEmojiActionBarHeight mEmojiPagerHeight = defaultKeyboardHeight - mEmojiActionBarHeight
- mEmojiCategoryPageIdViewHeight; - mEmojiCategoryPageIdViewHeight;
mEmojiPagerBottomMargin = mKeyVerticalGap / 2; mEmojiPagerBottomMargin = 0;
mEmojiKeyboardHeight = mEmojiPagerHeight - mEmojiPagerBottomMargin - 1; mEmojiKeyboardHeight = mEmojiPagerHeight - mEmojiPagerBottomMargin - 1;
} }