diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-06-06 09:05:38 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-06-06 09:05:38 +0000 |
| commit | b54c9deb4e2a04efd2184aa7d7bf71e38014b272 (patch) | |
| tree | 68a9e52aceba923ff6d70df57181912737f28617 /java/src/com/android/inputmethod/latin/settings/SettingsValues.java | |
| parent | 46a705f250aee105c218e31c5100609517c52eb4 (diff) | |
| parent | bd3b20ce733e19ac6a97a7f6934fc2ba0d183890 (diff) | |
| download | latinime-b54c9deb4e2a04efd2184aa7d7bf71e38014b272.tar.gz latinime-b54c9deb4e2a04efd2184aa7d7bf71e38014b272.tar.xz latinime-b54c9deb4e2a04efd2184aa7d7bf71e38014b272.zip | |
am bd3b20ce: Merge "Always update voice key visibility"
* commit 'bd3b20ce733e19ac6a97a7f6934fc2ba0d183890':
Always update voice key visibility
Diffstat (limited to 'java/src/com/android/inputmethod/latin/settings/SettingsValues.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/SettingsValues.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java index e53408da4..389d9a869 100644 --- a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java +++ b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java @@ -28,6 +28,7 @@ import com.android.inputmethod.compat.AppWorkaroundsUtils; import com.android.inputmethod.latin.InputAttributes; import com.android.inputmethod.latin.R; import com.android.inputmethod.latin.RichInputMethodManager; +import com.android.inputmethod.latin.SubtypeSwitcher; import com.android.inputmethod.latin.utils.AsyncResultHolder; import com.android.inputmethod.latin.utils.ResourceUtils; import com.android.inputmethod.latin.utils.TargetPackageInfoGetterTask; @@ -122,7 +123,10 @@ public final class SettingsValues { mKeyPreviewPopupOn = Settings.readKeyPreviewPopupEnabled(prefs, res); mSlidingKeyInputPreviewEnabled = prefs.getBoolean( DebugSettings.PREF_SLIDING_KEY_INPUT_PREVIEW, true); - mShowsVoiceInputKey = needsToShowVoiceInputKey(prefs, res); + mShowsVoiceInputKey = needsToShowVoiceInputKey(prefs, res) + && !mInputAttributes.mIsPasswordField + && !mInputAttributes.hasNoMicrophoneKeyOption() + && SubtypeSwitcher.getInstance().isShortcutImeEnabled(); final String autoCorrectionThresholdRawValue = prefs.getString( Settings.PREF_AUTO_CORRECTION_THRESHOLD, res.getString(R.string.auto_correction_threshold_mode_index_modest)); |