diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-11-04 09:57:59 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-11-04 09:57:59 +0000 |
| commit | 8e3a1c4dcb76ea2560745d3996be886f13b47c5d (patch) | |
| tree | 8e67ca141be2817a96fa7e2f6bd95e36e7bd69c5 /java | |
| parent | e75b9b6a9eee4153c66591e9c0df2159f402b305 (diff) | |
| parent | c514d3ead2bea8e067a3efb9cfc7bea3b0226294 (diff) | |
| download | latinime-8e3a1c4dcb76ea2560745d3996be886f13b47c5d.tar.gz latinime-8e3a1c4dcb76ea2560745d3996be886f13b47c5d.tar.xz latinime-8e3a1c4dcb76ea2560745d3996be886f13b47c5d.zip | |
am c514d3ea: Merge "Fix Emoji key feedback"
* commit 'c514d3ead2bea8e067a3efb9cfc7bea3b0226294':
Fix Emoji key feedback
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/xml/kbd_emoji_category1.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/kbd_emoji_category2.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/kbd_emoji_category3.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/kbd_emoji_category4.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/kbd_emoji_category5.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/kbd_emoji_category6.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/kbd_emoji_recents.xml | 2 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/emoji/EmojiPageKeyboardView.java | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/java/res/xml/kbd_emoji_category1.xml b/java/res/xml/kbd_emoji_category1.xml index 5145ea9d3..2770cfb15 100644 --- a/java/res/xml/kbd_emoji_category1.xml +++ b/java/res/xml/kbd_emoji_category1.xml @@ -27,5 +27,5 @@ <GridRows latin:codesArray="@array/emoji_faces" latin:keyLabelFlags="fontNormal" - latin:backgroundType="empty" /> + latin:backgroundType="normal" /> </Keyboard> diff --git a/java/res/xml/kbd_emoji_category2.xml b/java/res/xml/kbd_emoji_category2.xml index ac8784f4b..d547056e1 100644 --- a/java/res/xml/kbd_emoji_category2.xml +++ b/java/res/xml/kbd_emoji_category2.xml @@ -27,5 +27,5 @@ <GridRows latin:codesArray="@array/emoji_objects" latin:keyLabelFlags="fontNormal" - latin:backgroundType="empty" /> + latin:backgroundType="normal" /> </Keyboard> diff --git a/java/res/xml/kbd_emoji_category3.xml b/java/res/xml/kbd_emoji_category3.xml index 88c4db92b..2172d9880 100644 --- a/java/res/xml/kbd_emoji_category3.xml +++ b/java/res/xml/kbd_emoji_category3.xml @@ -27,5 +27,5 @@ <GridRows latin:codesArray="@array/emoji_nature" latin:keyLabelFlags="fontNormal" - latin:backgroundType="empty" /> + latin:backgroundType="normal" /> </Keyboard> diff --git a/java/res/xml/kbd_emoji_category4.xml b/java/res/xml/kbd_emoji_category4.xml index 262384d80..46b6d46e8 100644 --- a/java/res/xml/kbd_emoji_category4.xml +++ b/java/res/xml/kbd_emoji_category4.xml @@ -27,5 +27,5 @@ <GridRows latin:codesArray="@array/emoji_places" latin:keyLabelFlags="fontNormal" - latin:backgroundType="empty" /> + latin:backgroundType="normal" /> </Keyboard> diff --git a/java/res/xml/kbd_emoji_category5.xml b/java/res/xml/kbd_emoji_category5.xml index bf823f978..4304701d4 100644 --- a/java/res/xml/kbd_emoji_category5.xml +++ b/java/res/xml/kbd_emoji_category5.xml @@ -27,5 +27,5 @@ <GridRows latin:codesArray="@array/emoji_symbols" latin:keyLabelFlags="fontNormal" - latin:backgroundType="empty" /> + latin:backgroundType="normal" /> </Keyboard> diff --git a/java/res/xml/kbd_emoji_category6.xml b/java/res/xml/kbd_emoji_category6.xml index edb82fc64..516ed7a42 100644 --- a/java/res/xml/kbd_emoji_category6.xml +++ b/java/res/xml/kbd_emoji_category6.xml @@ -28,5 +28,5 @@ <GridRows latin:textsArray="@array/emoji_emoticons" latin:keyLabelFlags="fontNormal" - latin:backgroundType="empty" /> + latin:backgroundType="normal" /> </Keyboard> diff --git a/java/res/xml/kbd_emoji_recents.xml b/java/res/xml/kbd_emoji_recents.xml index edf3872c1..4953c1079 100644 --- a/java/res/xml/kbd_emoji_recents.xml +++ b/java/res/xml/kbd_emoji_recents.xml @@ -28,5 +28,5 @@ <GridRows latin:codesArray="@array/emoji_recents" latin:keyLabelFlags="fontNormal" - latin:backgroundType="empty" /> + latin:backgroundType="normal" /> </Keyboard> diff --git a/java/src/com/android/inputmethod/keyboard/emoji/EmojiPageKeyboardView.java b/java/src/com/android/inputmethod/keyboard/emoji/EmojiPageKeyboardView.java index 54d3e3b88..09313f811 100644 --- a/java/src/com/android/inputmethod/keyboard/emoji/EmojiPageKeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/emoji/EmojiPageKeyboardView.java @@ -148,7 +148,7 @@ final class EmojiPageKeyboardView extends KeyboardView implements void callListenerOnPressKey(final Key pressedKey) { mPendingKeyDown = null; - pressedKey.onReleased(); + pressedKey.onPressed(); invalidateKey(pressedKey); mListener.onPressKey(pressedKey); } |