commit | ae4833b2f9457743289577524ea3846045b1c498 | [log] [tgz] |
---|---|---|
author | Jean Chalard <jchalard@google.com> | Thu Oct 16 14:06:24 2014 +0900 |
committer | The Android Automerger <android-build@android.com> | Mon Oct 20 06:24:16 2014 -0700 |
tree | 1d15a33cb874a14f08b325c274de88b70a6ddf5d | |
parent | 6d392aa79ca00c5160446a584cb94e9248ec22f6 [diff] |
[ML27.1] Allow adding additional features to other settings We may want to add additional features from some of the other screens. Bug: 11230254 Bug: 17966252 Change-Id: I1bb877e5cbdd74f2ffa8010b5bc6af35fe77279a
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); } }
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