diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-06-19 01:49:36 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-06-19 01:49:36 +0000 |
| commit | 5e7af7077c77c650650eab17ddf637a5dbd76a7b (patch) | |
| tree | bdf7d87925cd23761d5be9d106703db7c1a927ac /java/src/com/android/inputmethod/latin/settings/SettingsValues.java | |
| parent | 335028c03935da770a74682a1568fadab7cb31a6 (diff) | |
| parent | d89a34b0a1e7b5df7526e42027f8379a25baa291 (diff) | |
| download | latinime-5e7af7077c77c650650eab17ddf637a5dbd76a7b.tar.gz latinime-5e7af7077c77c650650eab17ddf637a5dbd76a7b.tar.xz latinime-5e7af7077c77c650650eab17ddf637a5dbd76a7b.zip | |
am d89a34b0: Merge "Hide voice input key from URI, Email, Number, and Phone layout"
* commit 'd89a34b0a1e7b5df7526e42027f8379a25baa291':
Hide voice input key from URI, Email, Number, and Phone layout
Diffstat (limited to 'java/src/com/android/inputmethod/latin/settings/SettingsValues.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/SettingsValues.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java index 44104019b..8de5fed07 100644 --- a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java +++ b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java @@ -125,8 +125,7 @@ public final class SettingsValues { mSlidingKeyInputPreviewEnabled = prefs.getBoolean( DebugSettings.PREF_SLIDING_KEY_INPUT_PREVIEW, true); mShowsVoiceInputKey = needsToShowVoiceInputKey(prefs, res) - && !mInputAttributes.mIsPasswordField - && !mInputAttributes.hasNoMicrophoneKeyOption() + && mInputAttributes.mShouldShowVoiceInputKey && SubtypeSwitcher.getInstance().isShortcutImeEnabled(); final String autoCorrectionThresholdRawValue = prefs.getString( Settings.PREF_AUTO_CORRECTION_THRESHOLD, |