aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-10-16 11:08:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-10-16 11:08:37 +0000
commitbd4693cd3fffcca2b73953fc05df4bc1a9b0a1bc (patch)
tree9f46a736bd1a0f259f9bde45e97803364c945053 /java
parenteaa7efd136473c8f7aaf1b930c4c810316cf4595 (diff)
parentbdf70af17723d2ad480ead0f76c3b59acb9a45b7 (diff)
downloadlatinime-bd4693cd3fffcca2b73953fc05df4bc1a9b0a1bc.tar.gz
latinime-bd4693cd3fffcca2b73953fc05df4bc1a9b0a1bc.tar.xz
latinime-bd4693cd3fffcca2b73953fc05df4bc1a9b0a1bc.zip
Merge "[ML27.1] Allow adding additional features to other settings"
Diffstat (limited to 'java')
-rw-r--r--java/src/com/android/inputmethod/latin/settings/MultiLingualSettingsFragment.java1
-rw-r--r--java/src/com/android/inputmethod/latin/settings/SettingsFragment.java1
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