diff options
| author |   Jatin Matani <jatinm@google.com> | 2015-07-13 10:34:03 -0700 |
|---|---|---|
| committer | Jatin Matani <jatinm@google.com> | 2015-07-13 10:40:26 -0700 |
| commit | 80c9bfbd280d6ca519af201a2dc4f93bb3ab63b1 (patch) | |
| tree | dac73f877b51df06f1e8715c45e05761694e7f85 /java/src/com/android/inputmethod/latin/settings/Settings.java | |
| parent | b4b19735182767df88f3a196a94c4a943423e72b (diff) | |
| parent | 9cd60fe1bb67cec755c1cee6d541272e64129072 (diff) | |
| download | latinime-80c9bfbd280d6ca519af201a2dc4f93bb3ab63b1.tar.gz latinime-80c9bfbd280d6ca519af201a2dc4f93bb3ab63b1.tar.xz latinime-80c9bfbd280d6ca519af201a2dc4f93bb3ab63b1.zip | |
resolved conflicts for merge of 9cd60fe1 to mnc-dr-dev
Change-Id: I8c7e0f48dad8eff174df4ffdebeeb9467fd799a0
Diffstat (limited to 'java/src/com/android/inputmethod/latin/settings/Settings.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/Settings.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/Settings.java b/java/src/com/android/inputmethod/latin/settings/Settings.java index 694f43d3f..940f1bdfc 100644 --- a/java/src/com/android/inputmethod/latin/settings/Settings.java +++ b/java/src/com/android/inputmethod/latin/settings/Settings.java @@ -56,6 +56,7 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang // PREF_VOICE_MODE_OBSOLETE is obsolete. Use PREF_VOICE_INPUT_KEY instead. public static final String PREF_VOICE_MODE_OBSOLETE = "voice_mode"; public static final String PREF_VOICE_INPUT_KEY = "pref_voice_input_key"; + public static final String PREF_EDIT_PERSONAL_DICTIONARY = "edit_personal_dictionary"; public static final String PREF_CONFIGURE_DICTIONARIES_KEY = "configure_dictionaries_key"; // PREF_AUTO_CORRECTION_THRESHOLD_OBSOLETE is obsolete. Use PREF_AUTO_CORRECTION instead. public static final String PREF_AUTO_CORRECTION_THRESHOLD_OBSOLETE = |