Merge "Disable popup preview and long press on disabled key" (b428e8cc) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -379,7 +379,7 @@ public class Key {
		* @see android.graphics.drawable.StateListDrawable#setState(int[])
		*/
		public int[] getCurrentDrawableState() {
		final boolean pressed = mEnabled && mPressed;
		final boolean pressed = mPressed;
		if (!mSticky && mFunctional) {
		if (pressed) {
		return KEY_STATE_FUNCTIONAL_PRESSED;

+5 −0

Original line number	Diff line number	Diff line
		@@ -546,6 +546,9 @@ public class PointerTracker {
		}

		private void showKeyPreviewAndUpdateKeyGraphics(int keyIndex) {
		final Key key = getKey(keyIndex);
		if (key != null && !key.mEnabled)
		return;
		updateKeyGraphics(keyIndex);
		// The modifier key, such as shift key, should not be shown as preview when multi-touch is
		// supported. On the other hand, if multi-touch is not supported, the modifier key should
		@@ -565,6 +568,8 @@ public class PointerTracker {
		return;
		}
		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