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

am c514d3ea: Merge "Fix Emoji key feedback" 

* commit 'c514d3ead2bea8e067a3efb9cfc7bea3b0226294':
  Fix Emoji key feedback
main
Tadashi G. Takaoka 2014-11-04 09:57:59 +00:00 committed by Android Git Automerger
parent e75b9b6a9e c514d3ead2
commit 8e3a1c4dcb
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/res/xml/kbd_emoji_category1.xml
View File

@ -27,5 +27,5 @@
<GridRows <GridRows
latin:codesArray="@array/emoji_faces" latin:codesArray="@array/emoji_faces"
latin:keyLabelFlags="fontNormal" latin:keyLabelFlags="fontNormal"
latin:backgroundType="empty" /> latin:backgroundType="normal" />
</Keyboard> </Keyboard>

2
java/res/xml/kbd_emoji_category2.xml
View File

@ -27,5 +27,5 @@
<GridRows <GridRows
latin:codesArray="@array/emoji_objects" latin:codesArray="@array/emoji_objects"
latin:keyLabelFlags="fontNormal" latin:keyLabelFlags="fontNormal"
latin:backgroundType="empty" /> latin:backgroundType="normal" />
</Keyboard> </Keyboard>

2
java/res/xml/kbd_emoji_category3.xml
View File

@ -27,5 +27,5 @@
<GridRows <GridRows
latin:codesArray="@array/emoji_nature" latin:codesArray="@array/emoji_nature"
latin:keyLabelFlags="fontNormal" latin:keyLabelFlags="fontNormal"
latin:backgroundType="empty" /> latin:backgroundType="normal" />
</Keyboard> </Keyboard>

2
java/res/xml/kbd_emoji_category4.xml
View File

@ -27,5 +27,5 @@
<GridRows <GridRows
latin:codesArray="@array/emoji_places" latin:codesArray="@array/emoji_places"
latin:keyLabelFlags="fontNormal" latin:keyLabelFlags="fontNormal"
latin:backgroundType="empty" /> latin:backgroundType="normal" />
</Keyboard> </Keyboard>

2
java/res/xml/kbd_emoji_category5.xml
View File

@ -27,5 +27,5 @@
<GridRows <GridRows
latin:codesArray="@array/emoji_symbols" latin:codesArray="@array/emoji_symbols"
latin:keyLabelFlags="fontNormal" latin:keyLabelFlags="fontNormal"
latin:backgroundType="empty" /> latin:backgroundType="normal" />
</Keyboard> </Keyboard>

2
java/res/xml/kbd_emoji_category6.xml
View File

@ -28,5 +28,5 @@
<GridRows <GridRows
latin:textsArray="@array/emoji_emoticons" latin:textsArray="@array/emoji_emoticons"
latin:keyLabelFlags="fontNormal" latin:keyLabelFlags="fontNormal"
latin:backgroundType="empty" /> latin:backgroundType="normal" />
</Keyboard> </Keyboard>

2
java/res/xml/kbd_emoji_recents.xml
View File

@ -28,5 +28,5 @@
<GridRows <GridRows
latin:codesArray="@array/emoji_recents" latin:codesArray="@array/emoji_recents"
latin:keyLabelFlags="fontNormal" latin:keyLabelFlags="fontNormal"
latin:backgroundType="empty" /> latin:backgroundType="normal" />
</Keyboard> </Keyboard>

2
java/src/com/android/inputmethod/keyboard/emoji/EmojiPageKeyboardView.java
View File

@ -148,7 +148,7 @@ final class EmojiPageKeyboardView extends KeyboardView implements
void callListenerOnPressKey(final Key pressedKey) { void callListenerOnPressKey(final Key pressedKey) {
mPendingKeyDown = null; mPendingKeyDown = null;
pressedKey.onReleased(); pressedKey.onPressed();
invalidateKey(pressedKey); invalidateKey(pressedKey);
mListener.onPressKey(pressedKey); mListener.onPressKey(pressedKey);
} }