From 6ea0dab845e9b767d8d7d09c3690ad0f7076b24d Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Mon, 19 May 2014 14:06:48 +0900
Subject: [PATCH] Remove Emoji delete key UX hack

The Emoji delete key UX hack that changes key background color based
on the key state isn't keyboard theme compliant.

Change-Id: I0fa43a91cdd6da944d6d4d1a5a09b771f852a081
---
 java/res/layout/emoji_palettes_view.xml                    | 1 -
 java/res/values/colors.xml                                 | 4 ----
 .../inputmethod/keyboard/emoji/EmojiPalettesView.java      | 7 ++-----
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/java/res/layout/emoji_palettes_view.xml b/java/res/layout/emoji_palettes_view.xml
index 8cff503e4..c0c346ef0 100644
--- a/java/res/layout/emoji_palettes_view.xml
+++ b/java/res/layout/emoji_palettes_view.xml
@@ -70,7 +70,6 @@
             android:layout_width="0dip"
             android:layout_weight="12.5"
             android:layout_height="match_parent"
-            android:background="@color/emoji_key_background_color"
             android:src="@drawable/sym_keyboard_delete_holo_dark"
             android:contentDescription="@string/spoken_description_delete" />
     </LinearLayout>
diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml
index 674f77da0..12cb71f2e 100644
--- a/java/res/values/colors.xml
+++ b/java/res/values/colors.xml
@@ -61,8 +61,4 @@
     <color name="setup_welcome_video_margin_color">#FFCCCCCC</color>
     <color name="emoji_category_page_id_background_holo">#FF000000</color>
     <color name="emoji_category_page_id_foreground_holo">#80FFFFFF</color>
-
-    <!-- TODO: Color which should be included in the theme -->
-    <color name="emoji_key_background_color">#00000000</color>
-    <color name="emoji_key_pressed_background_color">#30FFFFFF</color>
 </resources>
diff --git a/java/src/com/android/inputmethod/keyboard/emoji/EmojiPalettesView.java b/java/src/com/android/inputmethod/keyboard/emoji/EmojiPalettesView.java
index 3813c578a..8e4595703 100644
--- a/java/src/com/android/inputmethod/keyboard/emoji/EmojiPalettesView.java
+++ b/java/src/com/android/inputmethod/keyboard/emoji/EmojiPalettesView.java
@@ -416,14 +416,11 @@ public final class EmojiPalettesView extends LinearLayout implements OnTabChange
 
     private static class DeleteKeyOnTouchListener implements OnTouchListener {
         static final long MAX_REPEAT_COUNT_TIME = TimeUnit.SECONDS.toMillis(30);
-        final int mDeleteKeyPressedBackgroundColor;
         final long mKeyRepeatStartTimeout;
         final long mKeyRepeatInterval;
 
         public DeleteKeyOnTouchListener(Context context) {
             final Resources res = context.getResources();
-            mDeleteKeyPressedBackgroundColor =
-                    res.getColor(R.color.emoji_key_pressed_background_color);
             mKeyRepeatStartTimeout = res.getInteger(R.integer.config_key_repeat_start_timeout);
             mKeyRepeatInterval = res.getInteger(R.integer.config_key_repeat_interval);
             mTimer = new CountDownTimer(MAX_REPEAT_COUNT_TIME, mKeyRepeatInterval) {
@@ -500,7 +497,7 @@ public final class EmojiPalettesView extends LinearLayout implements OnTabChange
             mTimer.cancel();
             mRepeatCount = 0;
             handleKeyDown();
-            v.setBackgroundColor(mDeleteKeyPressedBackgroundColor);
+            v.setPressed(true /* pressed */);
             mState = KEY_REPEAT_STATE_KEY_DOWN;
             mTimer.start();
         }
@@ -510,7 +507,7 @@ public final class EmojiPalettesView extends LinearLayout implements OnTabChange
             if (mState == KEY_REPEAT_STATE_KEY_DOWN) {
                 handleKeyUp();
             }
-            v.setBackgroundColor(Color.TRANSPARENT);
+            v.setPressed(false /* pressed */);
             mState = KEY_REPEAT_STATE_INITIALIZED;
         }