diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-10-16 11:10:33 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-10-16 11:10:33 +0000 |
| commit | 5930e471909345a6c58ef872bbe95d468d2dfbab (patch) | |
| tree | 0aa30320440a3ecc265a3a7d946280a0aa7c71dc /java/src | |
| parent | 63ccc79aad6290f2472f9f72e7dfa5233aa118be (diff) | |
| parent | bd4693cd3fffcca2b73953fc05df4bc1a9b0a1bc (diff) | |
| download | latinime-5930e471909345a6c58ef872bbe95d468d2dfbab.tar.gz latinime-5930e471909345a6c58ef872bbe95d468d2dfbab.tar.xz latinime-5930e471909345a6c58ef872bbe95d468d2dfbab.zip | |
am bd4693cd: Merge "[ML27.1] Allow adding additional features to other settings"
* commit 'bd4693cd3fffcca2b73953fc05df4bc1a9b0a1bc':
[ML27.1] Allow adding additional features to other settings
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/MultiLingualSettingsFragment.java | 1 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/SettingsFragment.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/MultiLingualSettingsFragment.java b/java/src/com/android/inputmethod/latin/settings/MultiLingualSettingsFragment.java index b073c50a4..b71f8829b 100644 --- a/java/src/com/android/inputmethod/latin/settings/MultiLingualSettingsFragment.java +++ b/java/src/com/android/inputmethod/latin/settings/MultiLingualSettingsFragment.java @@ -38,5 +38,6 @@ public final class MultiLingualSettingsFragment extends SubScreenFragment { removePreference(Settings.PREF_SHOW_LANGUAGE_SWITCH_KEY); removePreference(Settings.PREF_INCLUDE_OTHER_IMES_IN_LANGUAGE_SWITCH_LIST); } + AdditionalFeaturesSettingUtils.addAdditionalFeaturesPreferences(getActivity(), this); } } diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java b/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java index 8c4801798..6c21accf6 100644 --- a/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java +++ b/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java @@ -56,6 +56,7 @@ public final class SettingsFragment extends InputMethodSettingsFragment { final Preference accountsPreference = findPreference(Settings.SCREEN_ACCOUNTS); preferenceScreen.removePreference(accountsPreference); } + AdditionalFeaturesSettingUtils.addAdditionalFeaturesPreferences(getActivity(), this); } @Override |