am 4b852d60: Merge "Consolidate VibratorUtils with AudioAndHapticFeedbackManager"

* commit '4b852d60447901ce2f6e9ffe03a35f44fbb96f44':
  Consolidate VibratorUtils with AudioAndHapticFeedbackManager

1 files changed, 5 insertions, 4 deletions

diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java
index 222adcb2e..9ed35f24c 100644
--- a/java/src/com/android/inputmethod/latin/Settings.java
+++ b/java/src/com/android/inputmethod/latin/Settings.java
@@ -114,6 +114,7 @@ public final class Settings extends InputMethodSettingsFragment
         // {@link SubtypeLocale} class may not have been initialized. It is safe to call
         // {@link SubtypeLocale#init(Context)} multiple times.
         SubtypeLocale.init(context);
+        AudioAndHapticFeedbackManager.init(context);
         mVoicePreference = (ListPreference) findPreference(PREF_VOICE_MODE);
         mShowCorrectionSuggestionsPreference =
                 (ListPreference) findPreference(PREF_SHOW_SUGGESTIONS_SETTING);
@@ -154,7 +155,7 @@ public final class Settings extends InputMethodSettingsFragment
 
         final PreferenceGroup advancedSettings =
                 (PreferenceGroup) findPreference(PREF_ADVANCED_SETTINGS);
-        if (!VibratorUtils.getInstance(context).hasVibrator()) {
+        if (!AudioAndHapticFeedbackManager.getInstance().hasVibrator()) {
             generalSettings.removePreference(findPreference(PREF_VIBRATE_ON));
             if (null != advancedSettings) { // Theoretically advancedSettings cannot be null
                 advancedSettings.removePreference(findPreference(PREF_VIBRATION_DURATION_SETTINGS));
@@ -327,8 +328,8 @@ public final class Settings extends InputMethodSettingsFragment
     private void refreshEnablingsOfKeypressSoundAndVibrationSettings(
             final SharedPreferences sp, final Resources res) {
         if (mKeypressVibrationDurationSettingsPref != null) {
-            final boolean hasVibratorHardware = VibratorUtils.getInstance(getActivity())
-                    .hasVibrator();
+            final boolean hasVibratorHardware =
+                    AudioAndHapticFeedbackManager.getInstance().hasVibrator();
             final boolean vibrateOnByUser = sp.getBoolean(Settings.PREF_VIBRATE_ON,
                     res.getBoolean(R.bool.config_default_vibration_enabled));
             setPreferenceEnabled(mKeypressVibrationDurationSettingsPref,
@@ -359,7 +360,7 @@ public final class Settings extends InputMethodSettingsFragment
             @Override
             public void onStopTrackingTouch(final SeekBarDialog dialog) {
                 final int ms = dialog.getValue();
-                VibratorUtils.getInstance(context).vibrate(ms);
+                AudioAndHapticFeedbackManager.getInstance().vibrate(ms);
             }
         };
         final int currentMs = SettingsValues.getCurrentVibrationDuration(sp, getResources());