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

am bd4693cd: Merge "[ML27.1] Allow adding additional features to other settings" 

* commit 'bd4693cd3fffcca2b73953fc05df4bc1a9b0a1bc':
  [ML27.1] Allow adding additional features to other settings
main
Jean Chalard 2014-10-16 11:10:33 +00:00 committed by Android Git Automerger
parent 63ccc79aad bd4693cd3f
commit 5930e47190
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
java/src/com/android/inputmethod/latin/settings/MultiLingualSettingsFragment.java
View File

@ -38,5 +38,6 @@ public final class MultiLingualSettingsFragment extends SubScreenFragment {
removePreference(Settings.PREF_SHOW_LANGUAGE_SWITCH_KEY); removePreference(Settings.PREF_SHOW_LANGUAGE_SWITCH_KEY);
removePreference(Settings.PREF_INCLUDE_OTHER_IMES_IN_LANGUAGE_SWITCH_LIST); removePreference(Settings.PREF_INCLUDE_OTHER_IMES_IN_LANGUAGE_SWITCH_LIST);
} }
AdditionalFeaturesSettingUtils.addAdditionalFeaturesPreferences(getActivity(), this);
} }
} }

1
java/src/com/android/inputmethod/latin/settings/SettingsFragment.java
View File

@ -56,6 +56,7 @@ public final class SettingsFragment extends InputMethodSettingsFragment {
final Preference accountsPreference = findPreference(Settings.SCREEN_ACCOUNTS); final Preference accountsPreference = findPreference(Settings.SCREEN_ACCOUNTS);
preferenceScreen.removePreference(accountsPreference); preferenceScreen.removePreference(accountsPreference);
} }
AdditionalFeaturesSettingUtils.addAdditionalFeaturesPreferences(getActivity(), this);
} }
@Override @Override