From bdf70af17723d2ad480ead0f76c3b59acb9a45b7 Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Thu, 16 Oct 2014 14:06:24 +0900
Subject: [PATCH] [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
---
 .../inputmethod/latin/settings/MultiLingualSettingsFragment.java | 1 +
 .../com/android/inputmethod/latin/settings/SettingsFragment.java | 1 +
 2 files changed, 2 insertions(+)

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