Merge "Refactor KeyboardState.SavedKeyboardState class a bit" (76f47ee4) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java

+28 −23

Original line number	Original line	Diff line number	Diff line
	@@ -106,15 +106,17 @@ public final class KeyboardState {

	@Override		@Override
	public String toString() {		public String toString() {
	if (!mIsValid) return "INVALID";		if (!mIsValid) {
			return "INVALID";
			}
	if (mIsAlphabetMode) {		if (mIsAlphabetMode) {
	if (mIsAlphabetShiftLocked) return "ALPHABET_SHIFT_LOCKED";		return mIsAlphabetShiftLocked ? "ALPHABET_SHIFT_LOCKED"
	return "ALPHABET_" + shiftModeToString(mShiftMode);		: "ALPHABET_" + shiftModeToString(mShiftMode);
	} else if (mIsEmojiMode) {		}
			if (mIsEmojiMode) {
	return "EMOJI";		return "EMOJI";
	} else {
	return "SYMBOLS_" + shiftModeToString(mShiftMode);
	}		}
			return "SYMBOLS_" + shiftModeToString(mShiftMode);
	}		}
	}		}

	@@ -133,9 +135,16 @@ public final class KeyboardState {
	mPrevSymbolsKeyboardWasShifted = false;		mPrevSymbolsKeyboardWasShifted = false;
	mShiftKeyState.onRelease();		mShiftKeyState.onRelease();
	mSymbolKeyState.onRelease();		mSymbolKeyState.onRelease();
			if (mSavedKeyboardState.mIsValid) {
	onRestoreKeyboardState(autoCapsFlags, recapitalizeMode);		onRestoreKeyboardState(autoCapsFlags, recapitalizeMode);
			mSavedKeyboardState.mIsValid = false;
			} else {
			// Reset keyboard to alphabet mode.
			setAlphabetKeyboard(autoCapsFlags, recapitalizeMode);
			}
	}		}

			// Constants for {@link SavedKeyboardState#mShiftMode} and {@link #setShifted(int)}.
	private static final int UNSHIFT = 0;		private static final int UNSHIFT = 0;
	private static final int MANUAL_SHIFT = 1;		private static final int MANUAL_SHIFT = 1;
	private static final int AUTOMATIC_SHIFT = 2;		private static final int AUTOMATIC_SHIFT = 2;
	@@ -165,28 +174,24 @@ public final class KeyboardState {
	Log.d(TAG, "onRestoreKeyboardState: saved=" + state		Log.d(TAG, "onRestoreKeyboardState: saved=" + state
	+ " " + stateToString(autoCapsFlags, recapitalizeMode));		+ " " + stateToString(autoCapsFlags, recapitalizeMode));
	}		}
	if (!state.mIsValid \|\| state.mIsAlphabetMode) {		mPrevMainKeyboardWasShiftLocked = state.mIsAlphabetShiftLocked;
	setAlphabetKeyboard(autoCapsFlags, recapitalizeMode);
	} else if (state.mIsEmojiMode) {
	setEmojiKeyboard();
	} else {
	if (state.mShiftMode == MANUAL_SHIFT) {
	setSymbolsShiftedKeyboard();
	} else {
	setSymbolsKeyboard();
	}
	}

	if (!state.mIsValid) return;
	state.mIsValid = false;

	if (state.mIsAlphabetMode) {		if (state.mIsAlphabetMode) {
			setAlphabetKeyboard(autoCapsFlags, recapitalizeMode);
	setShiftLocked(state.mIsAlphabetShiftLocked);		setShiftLocked(state.mIsAlphabetShiftLocked);
	if (!state.mIsAlphabetShiftLocked) {		if (!state.mIsAlphabetShiftLocked) {
	setShifted(state.mShiftMode);		setShifted(state.mShiftMode);
	}		}
			return;
			}
			if (state.mIsEmojiMode) {
			setEmojiKeyboard();
			return;
			}
			// Symbol mode
			if (state.mShiftMode == MANUAL_SHIFT) {
			setSymbolsShiftedKeyboard();
	} else {		} else {
	mPrevMainKeyboardWasShiftLocked = state.mIsAlphabetShiftLocked;		setSymbolsKeyboard();
	}		}
	}		}