Enable long press even if the key is disabled
Change-Id: Iddab254c7d6625bf44473109b4a52d2f7a163a27main
parent
ee80a77ebf
commit
e07b51e7c6
|
@ -876,6 +876,8 @@ public class KeyboardView extends View implements PointerTracker.UIProxy {
|
||||||
// Dismiss key preview (in this case, slide language switcher) without any delay.
|
// Dismiss key preview (in this case, slide language switcher) without any delay.
|
||||||
mPreviewText.setVisibility(View.INVISIBLE);
|
mPreviewText.setVisibility(View.INVISIBLE);
|
||||||
}
|
}
|
||||||
|
// Clear key preview display position.
|
||||||
|
mKeyPreviewPopupDisplayedY = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void addKeyPreview(TextView keyPreview) {
|
private void addKeyPreview(TextView keyPreview) {
|
||||||
|
|
|
@ -633,8 +633,6 @@ public class PointerTracker {
|
||||||
|
|
||||||
private void startLongPressTimer(int keyIndex) {
|
private void startLongPressTimer(int keyIndex) {
|
||||||
Key key = getKey(keyIndex);
|
Key key = getKey(keyIndex);
|
||||||
if (!key.mEnabled)
|
|
||||||
return;
|
|
||||||
if (key.mCode == Keyboard.CODE_SHIFT) {
|
if (key.mCode == Keyboard.CODE_SHIFT) {
|
||||||
mHandler.startLongPressShiftTimer(mLongPressShiftKeyTimeout, keyIndex, this);
|
mHandler.startLongPressShiftTimer(mLongPressShiftKeyTimeout, keyIndex, this);
|
||||||
} else if (key.mManualTemporaryUpperCaseCode != Keyboard.CODE_DUMMY
|
} else if (key.mManualTemporaryUpperCaseCode != Keyboard.CODE_DUMMY
|
||||||
|
|
|
@ -16,8 +16,6 @@
|
||||||
|
|
||||||
package com.android.inputmethod.keyboard;
|
package com.android.inputmethod.keyboard;
|
||||||
|
|
||||||
import com.android.inputmethod.latin.R;
|
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.res.Resources;
|
import android.content.res.Resources;
|
||||||
import android.os.SystemClock;
|
import android.os.SystemClock;
|
||||||
|
@ -27,6 +25,8 @@ import android.view.MotionEvent;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.PopupWindow;
|
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
|
* A view that renders a virtual {@link MiniKeyboard}. It handles rendering of keys and detecting
|
||||||
* key presses and touch movements.
|
* key presses and touch movements.
|
||||||
|
@ -84,7 +84,7 @@ public class PopupMiniKeyboardView extends KeyboardView implements PopupPanel {
|
||||||
+ parentKeyboardView.getPaddingTop() + mCoordinates[1];
|
+ parentKeyboardView.getPaddingTop() + mCoordinates[1];
|
||||||
final int x = miniKeyboardX;
|
final int x = miniKeyboardX;
|
||||||
final int y = parentKeyboardView.isKeyPreviewPopupEnabled() &&
|
final int y = parentKeyboardView.isKeyPreviewPopupEnabled() &&
|
||||||
miniKeyboard.isOneRowKeyboard() ? keyPreviewY : miniKeyboardY;
|
miniKeyboard.isOneRowKeyboard() && keyPreviewY >= 0 ? keyPreviewY : miniKeyboardY;
|
||||||
|
|
||||||
if (miniKeyboard.setShifted(parentKeyboard.isShiftedOrShiftLocked())) {
|
if (miniKeyboard.setShifted(parentKeyboard.isShiftedOrShiftLocked())) {
|
||||||
invalidateAllKeys();
|
invalidateAllKeys();
|
||||||
|
|
Loading…
Reference in New Issue