diff options
| author |   Alan Viverette <alanv@google.com> | 2013-09-30 18:14:12 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2013-09-30 18:14:13 +0000 |
| commit | 458fb52b985d9c4f37b82689b573d42f95487a32 (patch) | |
| tree | 5bebf998f0900f022a9c5f18cfd7774d2c97b352 /java/src/com/android/inputmethod/accessibility/AccessibilityEntityProvider.java | |
| parent | bf1beefd08222521b4f44638a06c0d7582a8e4ae (diff) | |
| parent | 67319f92f31ca5b40e1f80f7b9ae63b9d8886f0e (diff) | |
| download | latinime-458fb52b985d9c4f37b82689b573d42f95487a32.tar.gz latinime-458fb52b985d9c4f37b82689b573d42f95487a32.tar.xz latinime-458fb52b985d9c4f37b82689b573d42f95487a32.zip | |
Merge "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; + } } /** |