Update shift state when alphabet keyboard has been set (c88026e1) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -324,6 +324,12 @@ public class KeyboardSwitcher implements KeyboardState.SwitchActions,
		setKeyboard(mKeyboardSet.getSymbolsShiftedKeyboard());
		}

		// Implements {@link KeyboardState.SwitchActions}.
		@Override
		public void requestUpdatingShiftState() {
		mState.onUpdateShiftState(mInputMethodService.getCurrentAutoCapsState());
		}

		public boolean isInMomentarySwitchState() {
		return mState.isInMomentarySwitchState();
		}

+6 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,11 @@ public class KeyboardState {
		public void setSymbolsKeyboard();

		public void setSymbolsShiftedKeyboard();

		/**
		* Request to call back {@link KeyboardState#onUpdateShiftState(boolean)}.
		*/
		public void requestUpdatingShiftState();
		}

		private KeyboardShiftState mKeyboardShiftState = new KeyboardShiftState();
		@@ -212,6 +217,7 @@ public class KeyboardState {
		mSwitchState = SWITCH_STATE_ALPHA;
		setShiftLocked(mPrevMainKeyboardWasShiftLocked);
		mPrevMainKeyboardWasShiftLocked = false;
		mSwitchActions.requestUpdatingShiftState();
		}

		private void setSymbolsKeyboard() {

+5 −1

Original line number	Diff line number	Diff line
		@@ -71,6 +71,11 @@ public class KeyboardStateTests extends AndroidTestCase {
		mLayout = SYMBOLS_SHIFTED;
		}

		@Override
		public void requestUpdatingShiftState() {
		mState.onUpdateShiftState(mAutoCaps);
		}

		public void toggleCapsLock() {
		mState.onToggleCapsLock();
		}
		@@ -111,7 +116,6 @@ public class KeyboardStateTests extends AndroidTestCase {
		public void onCancelInput(boolean isSinglePointer) {
		mState.onCancelInput(isSinglePointer);
		}

		}

		private MockKeyboardSwitcher mSwitcher;