aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-11-04 11:24:26 +0000
committerTadashi G. Takaoka <takaoka@google.com>2014-11-04 11:24:26 +0000
commita5d24336bf7830677d2bb2403cdaf1b2d8796f8a (patch)
tree63d63b39e93cce5bfd37d567806ec05a099af0b0 /java
parent953858d6153d844226e4b8352a63193c29606dd7 (diff)
downloadlatinime-a5d24336bf7830677d2bb2403cdaf1b2d8796f8a.tar.gz
latinime-a5d24336bf7830677d2bb2403cdaf1b2d8796f8a.tar.xz
latinime-a5d24336bf7830677d2bb2403cdaf1b2d8796f8a.zip
Revert "Fix Emoji key feedback"
This reverts commit 953858d6153d844226e4b8352a63193c29606dd7. The original CL should be split into two. Change-Id: Ic1d032e2964a1b9bb44d98bdb8573c6cb47a865c
Diffstat (limited to 'java')
-rw-r--r--java/res/xml/kbd_emoji_category1.xml2
-rw-r--r--java/res/xml/kbd_emoji_category2.xml2
-rw-r--r--java/res/xml/kbd_emoji_category3.xml2
-rw-r--r--java/res/xml/kbd_emoji_category4.xml2
-rw-r--r--java/res/xml/kbd_emoji_category5.xml2
-rw-r--r--java/res/xml/kbd_emoji_category6.xml2
-rw-r--r--java/res/xml/kbd_emoji_recents.xml2
-rw-r--r--java/src/com/android/inputmethod/keyboard/emoji/EmojiPageKeyboardView.java2
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);
}