am 3db17c53: Merge "[ML9.1] Add option for multi-lingual support"

* commit '3db17c5394f8a4413155015fdca54625504af3ff':
  [ML9.1] Add option for multi-lingual support
This commit is contained in:
Jean Chalard 2014-09-24 02:49:57 +00:00 committed by Android Git Automerger
commit 6a1516fe11
2 changed files with 4 additions and 3 deletions

View file

@ -18,8 +18,7 @@ package com.android.inputmethod.latin.settings;
import android.content.Context;
import android.content.SharedPreferences;
import com.android.inputmethodcommon.InputMethodSettingsFragment;
import android.preference.PreferenceFragment;
/**
* Utility class for managing additional features settings.
@ -32,7 +31,7 @@ public class AdditionalFeaturesSettingUtils {
}
public static void addAdditionalFeaturesPreferences(
final Context context, final InputMethodSettingsFragment settingsFragment) {
final Context context, final PreferenceFragment settingsFragment) {
// do nothing.
}

View file

@ -109,6 +109,8 @@ public final class AdvancedSettingsFragment extends SubScreenFragment {
removePreference(Settings.PREF_ENABLE_METRICS_LOGGING);
}
AdditionalFeaturesSettingUtils.addAdditionalFeaturesPreferences(context, this);
setupKeypressVibrationDurationSettings();
setupKeypressSoundVolumeSettings();
refreshEnablingsOfKeypressSoundAndVibrationSettings();