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
main
Tadashi G. Takaoka 2014-05-19 14:06:48 +09:00
parent 10bd458efc
commit 6ea0dab845
3 changed files with 2 additions and 10 deletions

View File

@ -70,7 +70,6 @@
android:layout_width="0dip" android:layout_width="0dip"
android:layout_weight="12.5" android:layout_weight="12.5"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/emoji_key_background_color"
android:src="@drawable/sym_keyboard_delete_holo_dark" android:src="@drawable/sym_keyboard_delete_holo_dark"
android:contentDescription="@string/spoken_description_delete" /> android:contentDescription="@string/spoken_description_delete" />
</LinearLayout> </LinearLayout>

View File

@ -61,8 +61,4 @@
<color name="setup_welcome_video_margin_color">#FFCCCCCC</color> <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_background_holo">#FF000000</color>
<color name="emoji_category_page_id_foreground_holo">#80FFFFFF</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> </resources>

View File

@ -416,14 +416,11 @@ public final class EmojiPalettesView extends LinearLayout implements OnTabChange
private static class DeleteKeyOnTouchListener implements OnTouchListener { private static class DeleteKeyOnTouchListener implements OnTouchListener {
static final long MAX_REPEAT_COUNT_TIME = TimeUnit.SECONDS.toMillis(30); static final long MAX_REPEAT_COUNT_TIME = TimeUnit.SECONDS.toMillis(30);
final int mDeleteKeyPressedBackgroundColor;
final long mKeyRepeatStartTimeout; final long mKeyRepeatStartTimeout;
final long mKeyRepeatInterval; final long mKeyRepeatInterval;
public DeleteKeyOnTouchListener(Context context) { public DeleteKeyOnTouchListener(Context context) {
final Resources res = context.getResources(); 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); mKeyRepeatStartTimeout = res.getInteger(R.integer.config_key_repeat_start_timeout);
mKeyRepeatInterval = res.getInteger(R.integer.config_key_repeat_interval); mKeyRepeatInterval = res.getInteger(R.integer.config_key_repeat_interval);
mTimer = new CountDownTimer(MAX_REPEAT_COUNT_TIME, mKeyRepeatInterval) { mTimer = new CountDownTimer(MAX_REPEAT_COUNT_TIME, mKeyRepeatInterval) {
@ -500,7 +497,7 @@ public final class EmojiPalettesView extends LinearLayout implements OnTabChange
mTimer.cancel(); mTimer.cancel();
mRepeatCount = 0; mRepeatCount = 0;
handleKeyDown(); handleKeyDown();
v.setBackgroundColor(mDeleteKeyPressedBackgroundColor); v.setPressed(true /* pressed */);
mState = KEY_REPEAT_STATE_KEY_DOWN; mState = KEY_REPEAT_STATE_KEY_DOWN;
mTimer.start(); mTimer.start();
} }
@ -510,7 +507,7 @@ public final class EmojiPalettesView extends LinearLayout implements OnTabChange
if (mState == KEY_REPEAT_STATE_KEY_DOWN) { if (mState == KEY_REPEAT_STATE_KEY_DOWN) {
handleKeyUp(); handleKeyUp();
} }
v.setBackgroundColor(Color.TRANSPARENT); v.setPressed(false /* pressed */);
mState = KEY_REPEAT_STATE_INITIALIZED; mState = KEY_REPEAT_STATE_INITIALIZED;
} }