From a5d24336bf7830677d2bb2403cdaf1b2d8796f8a Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Tue, 4 Nov 2014 11:24:26 +0000
Subject: [PATCH] Revert "Fix Emoji key feedback"
This reverts commit 953858d6153d844226e4b8352a63193c29606dd7.
The original CL should be split into two.
Change-Id: Ic1d032e2964a1b9bb44d98bdb8573c6cb47a865c
---
java/res/xml/kbd_emoji_category1.xml | 2 +-
java/res/xml/kbd_emoji_category2.xml | 2 +-
java/res/xml/kbd_emoji_category3.xml | 2 +-
java/res/xml/kbd_emoji_category4.xml | 2 +-
java/res/xml/kbd_emoji_category5.xml | 2 +-
java/res/xml/kbd_emoji_category6.xml | 2 +-
java/res/xml/kbd_emoji_recents.xml | 2 +-
.../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 2770cfb151..5145ea9d3f 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 d547056e1b..ac8784f4b4 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 2172d9880e..88c4db92b6 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 46b6d46e88..262384d80b 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 4304701d4e..bf823f9784 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 516ed7a421..edb82fc646 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 4953c1079f..edf3872c11 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 09313f8117..54d3e3b88a 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);
}
--
GitLab