nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 3bfacd44: Merge "Remove Emoji delete key UX hack" 

* commit '3bfacd445ec5a54d5b27ae0818abc342b466aa6d':
  Remove Emoji delete key UX hack
main
Tadashi G. Takaoka 2014-05-19 05:36:32 +00:00 committed by Android Git Automerger
parent a8daf43e92 3bfacd445e
commit ca0909c13d
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
java/res/layout/emoji_palettes_view.xml
View File

@ -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>

4
java/res/values/colors.xml
View File

@ -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>

7
java/src/com/android/inputmethod/keyboard/emoji/EmojiPalettesView.java
View File

@ -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;
}