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/Settings.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 'java/src/com/android/inputmethod/latin/Settings.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/Settings.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java index 70acdc771..45608f439 100644 --- a/java/src/com/android/inputmethod/latin/Settings.java +++ b/java/src/com/android/inputmethod/latin/Settings.java @@ -39,6 +39,7 @@ import android.widget.SeekBar.OnSeekBarChangeListener; import android.widget.TextView; import com.android.inputmethod.latin.define.ProductionFlag; +import com.android.inputmethod.research.ResearchLogger; import com.android.inputmethodcommon.InputMethodSettingsFragment; public class Settings extends InputMethodSettingsFragment @@ -70,6 +71,7 @@ public class Settings extends InputMethodSettingsFragment "pref_key_preview_popup_dismiss_delay"; public static final String PREF_KEY_USE_CONTACTS_DICT = "pref_key_use_contacts_dict"; public static final String PREF_BIGRAM_PREDICTIONS = "next_word_prediction"; + public static final String PREF_GESTURE_INPUT = "gesture_input"; public static final String PREF_VIBRATION_DURATION_SETTINGS = "pref_vibration_duration_settings"; public static final String PREF_KEYPRESS_SOUND_VOLUME = @@ -196,6 +198,12 @@ public class Settings extends InputMethodSettingsFragment textCorrectionGroup.removePreference(dictionaryLink); } + final boolean gestureInputEnabledByBuildConfig = res.getBoolean( + R.bool.config_gesture_input_enabled_by_build_config); + if (!gestureInputEnabledByBuildConfig) { + final Preference gestureInputPref = findPreference(PREF_GESTURE_INPUT); + miscSettings.removePreference(gestureInputPref); + } final boolean showUsabilityStudyModeOption = res.getBoolean(R.bool.config_enable_usability_study_mode_option) || ProductionFlag.IS_EXPERIMENTAL || ENABLE_EXPERIMENTAL_SETTINGS; @@ -208,7 +216,8 @@ public class Settings extends InputMethodSettingsFragment if (ProductionFlag.IS_EXPERIMENTAL) { if (usabilityStudyPref instanceof CheckBoxPreference) { CheckBoxPreference checkbox = (CheckBoxPreference)usabilityStudyPref; - checkbox.setChecked(prefs.getBoolean(PREF_USABILITY_STUDY_MODE, true)); + checkbox.setChecked(prefs.getBoolean(PREF_USABILITY_STUDY_MODE, + ResearchLogger.DEFAULT_USABILITY_STUDY_MODE)); checkbox.setSummary(R.string.settings_warning_researcher_mode); } } |