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

Commit 598a25d9 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Enable long press even if the key is disabled"

parents d3ab465c e07b51e7

java/src/com/android/inputmethod/keyboard/KeyboardView.java

+2 −0
Original line number Diff line number Diff line
@@ -876,6 +876,8 @@ public class KeyboardView extends View implements PointerTracker.UIProxy { 
            // Dismiss key preview (in this case, slide language switcher) without any delay.

            mPreviewText.setVisibility(View.INVISIBLE);

        }

        // Clear key preview display position.

        mKeyPreviewPopupDisplayedY = -1;

    }



    private void addKeyPreview(TextView keyPreview) {

java/src/com/android/inputmethod/keyboard/PointerTracker.java

+0 −2
Original line number Diff line number Diff line
@@ -633,8 +633,6 @@ public class PointerTracker { 


    private void startLongPressTimer(int keyIndex) {

        Key key = getKey(keyIndex);

        if (!key.mEnabled)

            return;

        if (key.mCode == Keyboard.CODE_SHIFT) {

            mHandler.startLongPressShiftTimer(mLongPressShiftKeyTimeout, keyIndex, this);

        } else if (key.mManualTemporaryUpperCaseCode != Keyboard.CODE_DUMMY

java/src/com/android/inputmethod/keyboard/PopupMiniKeyboardView.java

+3 −3
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.inputmethod.keyboard;



import com.android.inputmethod.latin.R;



import android.content.Context;

import android.content.res.Resources;

import android.os.SystemClock;
@@ -27,6 +25,8 @@ import android.view.MotionEvent; 
import android.view.View;

import android.widget.PopupWindow;



import com.android.inputmethod.latin.R;



/**

 * A view that renders a virtual {@link MiniKeyboard}. It handles rendering of keys and detecting

 * key presses and touch movements.
@@ -84,7 +84,7 @@ public class PopupMiniKeyboardView extends KeyboardView implements PopupPanel { 
                + parentKeyboardView.getPaddingTop() + mCoordinates[1];

        final int x = miniKeyboardX;

        final int y = parentKeyboardView.isKeyPreviewPopupEnabled() &&

                miniKeyboard.isOneRowKeyboard() ? keyPreviewY : miniKeyboardY;

                miniKeyboard.isOneRowKeyboard() && keyPreviewY >= 0 ? keyPreviewY : miniKeyboardY;



        if (miniKeyboard.setShifted(parentKeyboard.isShiftedOrShiftLocked())) {

            invalidateAllKeys();