aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/LatinIME.java
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2012-03-07 13:11:58 +0900
committerJean Chalard <jchalard@google.com>2012-03-08 18:37:00 +0900
commit544c3c29527927239a6484efc30bc22f9cc4dad1 (patch)
tree7a2c66012e0c7d935c32db7ebe1dd0e54847308d /java/src/com/android/inputmethod/latin/LatinIME.java
parent29d967fdcbd3b4f4e467db14f5df9f3bd1f5c558 (diff)
downloadlatinime-544c3c29527927239a6484efc30bc22f9cc4dad1.tar.gz
latinime-544c3c29527927239a6484efc30bc22f9cc4dad1.tar.xz
latinime-544c3c29527927239a6484efc30bc22f9cc4dad1.zip
Get the view for haptic feedback as a parameter (A6)
It's rather annoying (and possibly dangerous) to keep this as a member. Get it from outside. Change-Id: I00c42db96395fb65204fb140aeedc82bf312a86e
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinIME.java')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index f8b5a677d..dc86cd576 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -557,8 +557,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
/* package */ void loadSettings() {
if (null == mPrefs) mPrefs = PreferenceManager.getDefaultSharedPreferences(this);
mSettingsValues = new SettingsValues(mPrefs, this, mSubtypeSwitcher.getInputLocaleStr());
- mFeedbackManager = new AudioAndHapticFeedbackManager(this, mSettingsValues,
- mKeyboardSwitcher);
+ mFeedbackManager = new AudioAndHapticFeedbackManager(this, mSettingsValues);
resetContactsDictionary(null == mSuggest ? null : mSuggest.getContactsDictionary());
}
@@ -2324,7 +2323,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
}
public void hapticAndAudioFeedback(final int primaryCode) {
- mFeedbackManager.hapticAndAudioFeedback(primaryCode);
+ mFeedbackManager.hapticAndAudioFeedback(primaryCode, mKeyboardSwitcher.getKeyboardView());
}
@Override
@@ -2362,7 +2361,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
// TODO: remove this method when VoiceProxy has been removed
public void vibrate() {
- mFeedbackManager.vibrate();
+ mFeedbackManager.vibrate(mKeyboardSwitcher.getKeyboardView());
}
public boolean isAutoCapitalized() {