Merge "TalkBack correct shift state" (412ac4c5) · Commits · e / os / android_packages_inputmethods_LatinIME

java/res/values/strings-talkback-descriptions.xml

+2 −3

Original line number	Diff line number	Diff line
		@@ -74,11 +74,10 @@
		<string name="spoken_description_shiftmode_on">Shift enabled</string>
		<!-- Spoken feedback after turning "Caps lock" mode on. -->
		<string name="spoken_description_shiftmode_locked">Caps lock enabled</string>
		<!-- Spoken feedback after turning "Shift" mode off. -->
		<string name="spoken_description_shiftmode_off">Shift disabled</string>

		<!-- Spoken feedback after changing to the symbols keyboard. -->
		<string name="spoken_description_mode_symbol">Symbols mode</string>
		<!-- Spoken feedback after changing to the symbols shift keyboard. -->
		<string name="spoken_description_mode_symbol_shift">Symbols shift mode</string>
		<!-- Spoken feedback after changing to the alphanumeric keyboard. -->
		<string name="spoken_description_mode_alpha">Letters mode</string>
		<!-- Spoken feedback after changing to the phone dialer keyboard. -->

java/src/com/android/inputmethod/accessibility/AccessibleKeyboardViewProxy.java

+56 −74

Original line number	Diff line number	Diff line
		@@ -136,12 +136,19 @@ public final class AccessibleKeyboardViewProxy extends AccessibilityDelegateComp
		return;
		}
		// Announce the language name only when the language is changed.
		if (lastKeyboard == null \|\| !lastKeyboard.mId.mSubtype.equals(keyboard.mId.mSubtype)) {
		if (lastKeyboard == null \|\| !keyboard.mId.mSubtype.equals(lastKeyboard.mId.mSubtype)) {
		announceKeyboardLanguage(keyboard);
		return;
		}
		// Announce the mode only when the mode is changed.
		if (lastKeyboardMode != keyboard.mId.mMode) {
		if (keyboard.mId.mMode != lastKeyboardMode) {
		announceKeyboardMode(keyboard);
		return;
		}
		// Announce the keyboard type only when the type is changed.
		if (keyboard.mId.mElementId != lastKeyboard.mId.mElementId) {
		announceKeyboardType(keyboard, lastKeyboard);
		return;
		}
		}

		@@ -174,9 +181,8 @@ public final class AccessibleKeyboardViewProxy extends AccessibilityDelegateComp
		* @param keyboard The new keyboard.
		*/
		private void announceKeyboardMode(final Keyboard keyboard) {
		final int mode = keyboard.mId.mMode;
		final Context context = mView.getContext();
		final int modeTextResId = KEYBOARD_MODE_RES_IDS.get(mode);
		final int modeTextResId = KEYBOARD_MODE_RES_IDS.get(keyboard.mId.mMode);
		if (modeTextResId == 0) {
		return;
		}
		@@ -185,6 +191,50 @@ public final class AccessibleKeyboardViewProxy extends AccessibilityDelegateComp
		sendWindowStateChanged(text);
		}

		/**
		* Announces which type of keyboard is being displayed.
		*
		* @param keyboard The new keyboard.
		* @param lastKeyboard The last keyboard.
		*/
		private void announceKeyboardType(final Keyboard keyboard, final Keyboard lastKeyboard) {
		final int lastElementId = lastKeyboard.mId.mElementId;
		final int resId;
		switch (keyboard.mId.mElementId) {
		case KeyboardId.ELEMENT_ALPHABET_AUTOMATIC_SHIFTED:
		case KeyboardId.ELEMENT_ALPHABET:
		if (lastElementId == KeyboardId.ELEMENT_ALPHABET
		\|\| lastElementId == KeyboardId.ELEMENT_ALPHABET_AUTOMATIC_SHIFTED) {
		return;
		}
		resId = R.string.spoken_description_mode_alpha;
		break;
		case KeyboardId.ELEMENT_ALPHABET_MANUAL_SHIFTED:
		resId = R.string.spoken_description_shiftmode_on;
		break;
		case KeyboardId.ELEMENT_ALPHABET_SHIFT_LOCK_SHIFTED:
		case KeyboardId.ELEMENT_ALPHABET_SHIFT_LOCKED:
		resId = R.string.spoken_description_shiftmode_locked;
		break;
		case KeyboardId.ELEMENT_SYMBOLS:
		resId = R.string.spoken_description_mode_symbol;
		break;
		case KeyboardId.ELEMENT_SYMBOLS_SHIFTED:
		resId = R.string.spoken_description_mode_symbol_shift;
		break;
		case KeyboardId.ELEMENT_PHONE:
		resId = R.string.spoken_description_mode_phone;
		break;
		case KeyboardId.ELEMENT_PHONE_SYMBOLS:
		resId = R.string.spoken_description_mode_phone_shift;
		break;
		default:
		return;
		}
		final String text = mView.getContext().getString(resId);
		sendWindowStateChanged(text);
		}

		/**
		* Announces that the keyboard has been hidden.
		*/
		@@ -301,7 +351,7 @@ public final class AccessibleKeyboardViewProxy extends AccessibilityDelegateComp
		}

		/**
		* Simulates a key press by injecting touch event into the keyboard view.
		* Simulates a key press by injecting touch an event into the keyboard view.
		* This avoids the complexity of trackers and listeners within the keyboard.
		*
		* @param key The key to press.
		@@ -318,7 +368,7 @@ public final class AccessibleKeyboardViewProxy extends AccessibilityDelegateComp
		}

		/**
		* Simulates a key release by injecting touch event into the keyboard view.
		* Simulates a key release by injecting touch an event into the keyboard view.
		* This avoids the complexity of trackers and listeners within the keyboard.
		*
		* @param key The key to release.
		@@ -383,72 +433,4 @@ public final class AccessibleKeyboardViewProxy extends AccessibilityDelegateComp
		}
		return true;
		}

		/**
		* Notifies the user of changes in the keyboard shift state.
		*/
		public void notifyShiftState() {
		if (mView == null \|\| mKeyboard == null) {
		return;
		}

		final KeyboardId keyboardId = mKeyboard.mId;
		final int elementId = keyboardId.mElementId;
		final Context context = mView.getContext();
		final CharSequence text;

		switch (elementId) {
		case KeyboardId.ELEMENT_ALPHABET_SHIFT_LOCK_SHIFTED:
		case KeyboardId.ELEMENT_ALPHABET_SHIFT_LOCKED:
		text = context.getText(R.string.spoken_description_shiftmode_locked);
		break;
		case KeyboardId.ELEMENT_ALPHABET_AUTOMATIC_SHIFTED:
		case KeyboardId.ELEMENT_ALPHABET_MANUAL_SHIFTED:
		case KeyboardId.ELEMENT_SYMBOLS_SHIFTED:
		text = context.getText(R.string.spoken_description_shiftmode_on);
		break;
		default:
		text = context.getText(R.string.spoken_description_shiftmode_off);
		}
		AccessibilityUtils.getInstance().announceForAccessibility(mView, text);
		}

		/**
		* Notifies the user of changes in the keyboard symbols state.
		*/
		public void notifySymbolsState() {
		if (mView == null \|\| mKeyboard == null) {
		return;
		}

		final KeyboardId keyboardId = mKeyboard.mId;
		final int elementId = keyboardId.mElementId;
		final Context context = mView.getContext();
		final int resId;

		switch (elementId) {
		case KeyboardId.ELEMENT_ALPHABET:
		case KeyboardId.ELEMENT_ALPHABET_AUTOMATIC_SHIFTED:
		case KeyboardId.ELEMENT_ALPHABET_MANUAL_SHIFTED:
		case KeyboardId.ELEMENT_ALPHABET_SHIFT_LOCK_SHIFTED:
		case KeyboardId.ELEMENT_ALPHABET_SHIFT_LOCKED:
		resId = R.string.spoken_description_mode_alpha;
		break;
		case KeyboardId.ELEMENT_SYMBOLS:
		case KeyboardId.ELEMENT_SYMBOLS_SHIFTED:
		resId = R.string.spoken_description_mode_symbol;
		break;
		case KeyboardId.ELEMENT_PHONE:
		resId = R.string.spoken_description_mode_phone;
		break;
		case KeyboardId.ELEMENT_PHONE_SYMBOLS:
		resId = R.string.spoken_description_mode_phone_shift;
		break;
		default:
		return;
		}

		final String text = context.getString(resId);
		AccessibilityUtils.getInstance().announceForAccessibility(mView, text);
		}
		}

java/src/com/android/inputmethod/latin/LatinIME.java

+0 −12

Original line number	Diff line number	Diff line
		@@ -1596,18 +1596,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
		public void onReleaseKey(final int primaryCode, final boolean withSliding) {
		mKeyboardSwitcher.onReleaseKey(primaryCode, withSliding, getCurrentAutoCapsState(),
		getCurrentRecapitalizeState());

		// If accessibility is on, ensure the user receives keyboard state updates.
		if (AccessibilityUtils.getInstance().isTouchExplorationEnabled()) {
		switch (primaryCode) {
		case Constants.CODE_SHIFT:
		AccessibleKeyboardViewProxy.getInstance().notifyShiftState();
		break;
		case Constants.CODE_SWITCH_ALPHA_SYMBOL:
		AccessibleKeyboardViewProxy.getInstance().notifySymbolsState();
		break;
		}
		}
		}

		private HardwareEventDecoder getHardwareKeyEventDecoder(final int deviceId) {