diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-11-04 11:29:11 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-11-04 11:29:11 +0000 |
| commit | a19bf5c797017cd2a7c02e952dd5e65453b73a1f (patch) | |
| tree | c2dff046a722cc19c9c1f2ba99d87196d08e3eef /java | |
| parent | aefe8880bd7f423d395262394556c2b863a44dbc (diff) | |
| parent | ede88a3bd66c172e15d3dc812191cc1771a0f338 (diff) | |
| download | latinime-a19bf5c797017cd2a7c02e952dd5e65453b73a1f.tar.gz latinime-a19bf5c797017cd2a7c02e952dd5e65453b73a1f.tar.xz latinime-a19bf5c797017cd2a7c02e952dd5e65453b73a1f.zip | |
am ede88a3b: Merge "Revert "Fix Emoji key feedback""
* commit 'ede88a3bd66c172e15d3dc812191cc1771a0f338':
Revert "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 2770cfb15..5145ea9d3 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="normal" /> + latin:backgroundType="empty" /> </Keyboard> diff --git a/java/res/xml/kbd_emoji_category2.xml b/java/res/xml/kbd_emoji_category2.xml index d547056e1..ac8784f4b 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="normal" /> + latin:backgroundType="empty" /> </Keyboard> diff --git a/java/res/xml/kbd_emoji_category3.xml b/java/res/xml/kbd_emoji_category3.xml index 2172d9880..88c4db92b 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="normal" /> + latin:backgroundType="empty" /> </Keyboard> diff --git a/java/res/xml/kbd_emoji_category4.xml b/java/res/xml/kbd_emoji_category4.xml index 46b6d46e8..262384d80 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="normal" /> + latin:backgroundType="empty" /> </Keyboard> diff --git a/java/res/xml/kbd_emoji_category5.xml b/java/res/xml/kbd_emoji_category5.xml index 4304701d4..bf823f978 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="normal" /> + latin:backgroundType="empty" /> </Keyboard> diff --git a/java/res/xml/kbd_emoji_category6.xml b/java/res/xml/kbd_emoji_category6.xml index 516ed7a42..edb82fc64 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="normal" /> + latin:backgroundType="empty" /> </Keyboard> diff --git a/java/res/xml/kbd_emoji_recents.xml b/java/res/xml/kbd_emoji_recents.xml index 4953c1079..edf3872c1 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="normal" /> + latin:backgroundType="empty" /> </Keyboard> diff --git a/java/src/com/android/inputmethod/keyboard/emoji/EmojiPageKeyboardView.java b/java/src/com/android/inputmethod/keyboard/emoji/EmojiPageKeyboardView.java index 09313f811..54d3e3b88 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.onPressed(); + pressedKey.onReleased(); invalidateKey(pressedKey); mListener.onPressKey(pressedKey); } |