diff options
| author |   Satoshi Kataoka <satok@google.com> | 2012-07-24 16:26:12 +0900 |
|---|---|---|
| committer | Satoshi Kataoka <satok@google.com> | 2012-07-24 16:26:12 +0900 |
| commit | 32555e832a5134ee6ef614175798b2a922e35d7f (patch) | |
| tree | 85086d3b08329a88d7452238cc4f6945c99df9a8 /java/src/com/android/inputmethod/latin/SettingsValues.java | |
| parent | 540b535ba61091443e8dc45650c4e89586c4b23e (diff) | |
| parent | 467f829bc890fbb5cde87540a8d54e10edbbdffb (diff) | |
| download | latinime-32555e832a5134ee6ef614175798b2a922e35d7f.tar.gz latinime-32555e832a5134ee6ef614175798b2a922e35d7f.tar.xz latinime-32555e832a5134ee6ef614175798b2a922e35d7f.zip | |
Merge remote-tracking branch 'goog/master' into mergescriptpackage
Conflicts:
java/res/values-da/strings.xml
java/res/values-es-rUS/strings.xml
java/res/values-fa/strings.xml
java/res/values-ko/strings.xml
java/res/values-pl/strings.xml
java/res/values-sk/strings.xml
java/res/values-sw/strings.xml
Change-Id: I1d4be3df6c54c328011c448f31f163fafb2a909a
Diffstat (limited to '')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/SettingsValues.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/SettingsValues.java b/java/src/com/android/inputmethod/latin/SettingsValues.java index 10025daf8..3ed981375 100644 --- a/java/src/com/android/inputmethod/latin/SettingsValues.java +++ b/java/src/com/android/inputmethod/latin/SettingsValues.java @@ -83,6 +83,7 @@ public class SettingsValues { @SuppressWarnings("unused") // TODO: Use this private final float mKeypressSoundVolumeRawValue; private final InputMethodSubtype[] mAdditionalSubtypes; + public final boolean mGestureInputEnabled; // From the input box private final InputAttributes mInputAttributes; @@ -169,6 +170,10 @@ public class SettingsValues { mVoiceKeyOnMain = mVoiceMode != null && mVoiceMode.equals(voiceModeMain); mAdditionalSubtypes = AdditionalSubtype.createAdditionalSubtypesArray( getPrefAdditionalSubtypes(prefs, res)); + final boolean gestureInputEnabledByBuildConfig = res.getBoolean( + R.bool.config_gesture_input_enabled_by_build_config); + mGestureInputEnabled = gestureInputEnabledByBuildConfig + && prefs.getBoolean(Settings.PREF_GESTURE_INPUT, true); mCorrectionEnabled = mAutoCorrectEnabled && !mInputAttributes.mInputTypeNoAutoCorrect; mSuggestionVisibility = createSuggestionVisibility(res); } |