Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ea0dab8 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

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
parent 10bd458e

java/res/layout/emoji_palettes_view.xml

+0 −1
Original line number Diff line number Diff line
@@ -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>

java/res/values/colors.xml

+0 −4
Original line number Diff line number Diff line
@@ -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>

java/src/com/android/inputmethod/keyboard/emoji/EmojiPalettesView.java

+2 −5
Original line number Diff line number Diff line
@@ -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;

        }