nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 2828d9ed: Merge "[ML10.1] Adjust call for additional features" 

* commit '2828d9eda7b9508ad815322ab440886a83f736db':
  [ML10.1] Adjust call for additional features
main
Jean Chalard 2014-09-25 09:26:41 +00:00 committed by Android Git Automerger
parent b497ff1c31 2828d9eda7
commit dc0ec946d4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java-overridable/src/com/android/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java
View File

@ -35,7 +35,7 @@ public class AdditionalFeaturesSettingUtils {
// do nothing. // do nothing.
} }
public static void readAdditionalFeaturesPreferencesIntoArray( public static void readAdditionalFeaturesPreferencesIntoArray(final Context context,
final SharedPreferences prefs, final int[] additionalFeaturesPreferences) { final SharedPreferences prefs, final int[] additionalFeaturesPreferences) {
// do nothing. // do nothing.
} }

2
java/src/com/android/inputmethod/latin/settings/SettingsValues.java
View File

@ -180,7 +180,7 @@ public class SettingsValues {
mAutoCorrectionEnabledPerUserSettings = mAutoCorrectEnabled mAutoCorrectionEnabledPerUserSettings = mAutoCorrectEnabled
&& !mInputAttributes.mInputTypeNoAutoCorrect; && !mInputAttributes.mInputTypeNoAutoCorrect;
mSuggestionsEnabledPerUserSettings = readSuggestionsEnabled(prefs); mSuggestionsEnabledPerUserSettings = readSuggestionsEnabled(prefs);
AdditionalFeaturesSettingUtils.readAdditionalFeaturesPreferencesIntoArray( AdditionalFeaturesSettingUtils.readAdditionalFeaturesPreferencesIntoArray(context,
prefs, mAdditionalFeaturesSettingValues); prefs, mAdditionalFeaturesSettingValues);
mTextHighlightColorForAddToDictionaryIndicator = res.getColor( mTextHighlightColorForAddToDictionaryIndicator = res.getColor(
R.color.text_decorator_add_to_dictionary_indicator_text_highlight_color); R.color.text_decorator_add_to_dictionary_indicator_text_highlight_color);