commit bd4693cd3fffcca2b73953fc05df4bc1a9b0a1bc
author Jean Chalard <jchalard@google.com> Thu Oct 16 11:08:36 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 16 11:08:37 2014 +0000
tree 9f46a736bd1a0f259f9bde45e97803364c945053
parent eaa7efd136473c8f7aaf1b930c4c810316cf4595
parent bdf70af17723d2ad480ead0f76c3b59acb9a45b7

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

java/src/com/android/inputmethod/latin/settings/MultiLingualSettingsFragment.java

diff --git a/java/src/com/android/inputmethod/latin/settings/MultiLingualSettingsFragment.java b/java/src/com/android/inputmethod/latin/settings/MultiLingualSettingsFragment.java
index b073c50..b71f882 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 @@
             removePreference(Settings.PREF_SHOW_LANGUAGE_SWITCH_KEY);
             removePreference(Settings.PREF_INCLUDE_OTHER_IMES_IN_LANGUAGE_SWITCH_LIST);
         }
+        AdditionalFeaturesSettingUtils.addAdditionalFeaturesPreferences(getActivity(), this);
     }
 }

java/src/com/android/inputmethod/latin/settings/SettingsFragment.java

diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java b/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java
index 8c48017..6c21acc 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 @@
             final Preference accountsPreference = findPreference(Settings.SCREEN_ACCOUNTS);
             preferenceScreen.removePreference(accountsPreference);
         }
+        AdditionalFeaturesSettingUtils.addAdditionalFeaturesPreferences(getActivity(), this);
     }
 
     @Override