aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-09-25 09:26:41 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-25 09:26:41 +0000
commitdc0ec946d4adbcabaddc5c048b57a1ded36cf077 (patch)
tree37651045bf7e88e957fc7aa8d6ba4c9f42062c82 /java/src/com/android/inputmethod
parentb497ff1c3195fb95b7cf5e857dd429e60169ebed (diff)
parent2828d9eda7b9508ad815322ab440886a83f736db (diff)
downloadlatinime-dc0ec946d4adbcabaddc5c048b57a1ded36cf077.tar.gz
latinime-dc0ec946d4adbcabaddc5c048b57a1ded36cf077.tar.xz
latinime-dc0ec946d4adbcabaddc5c048b57a1ded36cf077.zip
am 2828d9ed: Merge "[ML10.1] Adjust call for additional features"
* commit '2828d9eda7b9508ad815322ab440886a83f736db': [ML10.1] Adjust call for additional features
Diffstat (limited to 'java/src/com/android/inputmethod')
-rw-r--r--java/src/com/android/inputmethod/latin/settings/SettingsValues.java2
1 files changed, 1 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 964d5ce33..99f761ca6 100644
--- a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java
+++ b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java
@@ -180,7 +180,7 @@ public class SettingsValues {
mAutoCorrectionEnabledPerUserSettings = mAutoCorrectEnabled
&& !mInputAttributes.mInputTypeNoAutoCorrect;
mSuggestionsEnabledPerUserSettings = readSuggestionsEnabled(prefs);
- AdditionalFeaturesSettingUtils.readAdditionalFeaturesPreferencesIntoArray(
+ AdditionalFeaturesSettingUtils.readAdditionalFeaturesPreferencesIntoArray(context,
prefs, mAdditionalFeaturesSettingValues);
mTextHighlightColorForAddToDictionaryIndicator = res.getColor(
R.color.text_decorator_add_to_dictionary_indicator_text_highlight_color);