Merge "Fix graying animation of alt-code keys when space/enter is typed" (d4777552) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+14 −12

Original line number	Diff line number	Diff line
		@@ -370,7 +370,9 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
		// When user hits the space or the enter key, just cancel the while-typing timer.
		final int typedCode = typedKey.mCode;
		if (typedCode == Constants.CODE_SPACE \|\| typedCode == Constants.CODE_ENTER) {
		if (isTyping) {
		startWhileTypingFadeinAnimation(keyboardView);
		}
		return;
		}

		@@ -614,8 +616,18 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack

		@ExternallyReferenced
		public void setAltCodeKeyWhileTypingAnimAlpha(final int alpha) {
		if (mAltCodeKeyWhileTypingAnimAlpha == alpha) {
		return;
		}
		// Update the visual of alt-code-key-while-typing.
		mAltCodeKeyWhileTypingAnimAlpha = alpha;
		updateAltCodeKeyWhileTyping();
		final Keyboard keyboard = getKeyboard();
		if (keyboard == null) {
		return;
		}
		for (final Key key : keyboard.mAltCodeKeysWhileTyping) {
		invalidateKey(key);
		}
		}

		public void setKeyboardActionListener(final KeyboardActionListener listener) {
		@@ -1282,16 +1294,6 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
		invalidateKey(shortcutKey);
		}

		private void updateAltCodeKeyWhileTyping() {
		final Keyboard keyboard = getKeyboard();
		if (keyboard == null) {
		return;
		}
		for (final Key key : keyboard.mAltCodeKeysWhileTyping) {
		invalidateKey(key);
		}
		}

		public void startDisplayLanguageOnSpacebar(final boolean subtypeChanged,
		final boolean needsToDisplayLanguage, final boolean hasMultipleEnabledIMEsOrSubtypes) {
		mNeedsToDisplayLanguage = needsToDisplayLanguage;