diff options
| author |   Alan Viverette <alanv@google.com> | 2013-10-03 15:38:09 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-10-03 15:38:09 -0700 |
| commit | 2e0a2b2c5612ec6db9a6f6941350688a75014783 (patch) | |
| tree | dc29d625e9f5317bb8e655f5da3e0e1f414018df /java/src/com/android/inputmethod/accessibility/AccessibilityEntityProvider.java | |
| parent | 975520fc196cae7259513196997b2e121c548967 (diff) | |
| parent | 5c35c6ac78fd8b81a2755ae741ce60e71938942b (diff) | |
| download | latinime-2e0a2b2c5612ec6db9a6f6941350688a75014783.tar.gz latinime-2e0a2b2c5612ec6db9a6f6941350688a75014783.tar.xz latinime-2e0a2b2c5612ec6db9a6f6941350688a75014783.zip | |
am 5c35c6ac: am 1e2543f1: am 458fb52b: Merge "Speak auto-corrections for accessibility"
* commit '5c35c6ac78fd8b81a2755ae741ce60e71938942b':
Speak auto-corrections for accessibility
Diffstat (limited to 'java/src/com/android/inputmethod/accessibility/AccessibilityEntityProvider.java')
| -rw-r--r-- | java/src/com/android/inputmethod/accessibility/AccessibilityEntityProvider.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/accessibility/AccessibilityEntityProvider.java b/java/src/com/android/inputmethod/accessibility/AccessibilityEntityProvider.java index 7639432aa..c628c5b09 100644 --- a/java/src/com/android/inputmethod/accessibility/AccessibilityEntityProvider.java +++ b/java/src/com/android/inputmethod/accessibility/AccessibilityEntityProvider.java @@ -35,6 +35,8 @@ import android.view.inputmethod.EditorInfo; import com.android.inputmethod.keyboard.Key; import com.android.inputmethod.keyboard.Keyboard; import com.android.inputmethod.keyboard.KeyboardView; +import com.android.inputmethod.latin.settings.Settings; +import com.android.inputmethod.latin.settings.SettingsValues; import com.android.inputmethod.latin.utils.CollectionUtils; import com.android.inputmethod.latin.utils.CoordinateUtils; @@ -285,9 +287,15 @@ public final class AccessibilityEntityProvider extends AccessibilityNodeProvider private String getKeyDescription(final Key key) { final EditorInfo editorInfo = mInputMethodService.getCurrentInputEditorInfo(); final boolean shouldObscure = mAccessibilityUtils.shouldObscureInput(editorInfo); - final String keyDescription = mKeyCodeDescriptionMapper.getDescriptionForKey( + final SettingsValues currentSettings = Settings.getInstance().getCurrent(); + final String keyCodeDescription = mKeyCodeDescriptionMapper.getDescriptionForKey( mKeyboardView.getContext(), mKeyboardView.getKeyboard(), key, shouldObscure); - return keyDescription; + if (currentSettings.isWordSeparator(key.getCode())) { + return mAccessibilityUtils.getAutoCorrectionDescription( + keyCodeDescription, shouldObscure); + } else { + return keyCodeDescription; + } } /** |