nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 4187499c: Merge "Remove unnecessary methods of KeyboardSwitcher" 

* commit '4187499cb0cdd6b2a16d6d90743e411f7b9afc96':
  Remove unnecessary methods of KeyboardSwitcher
main
Tadashi G. Takaoka 2013-05-22 16:24:37 -07:00 committed by Android Git Automerger
parent 5075d07da0 4187499cb0
commit 4e41750d52
6 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
View File

@ -32,6 +32,7 @@ import com.android.inputmethod.keyboard.KeyboardLayoutSet.KeyboardLayoutSetExcep
import com.android.inputmethod.keyboard.PointerTracker.TimerProxy;
import com.android.inputmethod.keyboard.internal.KeyboardState;
import com.android.inputmethod.latin.AudioAndHapticFeedbackManager;
import com.android.inputmethod.latin.Constants;
import com.android.inputmethod.latin.InputView;
import com.android.inputmethod.latin.LatinIME;
import com.android.inputmethod.latin.LatinImeLogger;
@ -68,8 +69,6 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
new KeyboardTheme(5, R.style.KeyboardTheme_IceCreamSandwich),
};
private final AudioAndHapticFeedbackManager mFeedbackManager =
AudioAndHapticFeedbackManager.getInstance();
private SubtypeSwitcher mSubtypeSwitcher;
private SharedPreferences mPrefs;
@ -151,7 +150,6 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
mKeyboardLayoutSet = builder.build();
try {
mState.onLoadKeyboard();
mFeedbackManager.onSettingsChanged(settingsValues);
} catch (KeyboardLayoutSetException e) {
Log.w(TAG, "loading keyboard failed: " + e.mKeyboardId, e.getCause());
LatinImeLogger.logOnException(e.mKeyboardId.toString(), e.getCause());
@ -159,10 +157,6 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
}
}
public void onRingerModeChanged() {
mFeedbackManager.onRingerModeChanged();
}
public void saveKeyboardState() {
if (getKeyboard() != null) {
mState.onSaveKeyboardState();
@ -217,9 +211,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
}
public void onPressKey(final int code, final boolean isSinglePointer) {
if (isVibrateAndSoundFeedbackRequired()) {
mFeedbackManager.hapticAndAudioFeedback(code, mKeyboardView);
}
hapticAndAudioFeedback(code);
mState.onPressKey(code, isSinglePointer, mLatinIME.getCurrentAutoCapsState());
}
@ -328,24 +320,25 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
}
}
// Implements {@link KeyboardState.SwitchActions}.
@Override
public void hapticAndAudioFeedback(final int code) {
mFeedbackManager.hapticAndAudioFeedback(code, mKeyboardView);
private void hapticAndAudioFeedback(final int code) {
if (mKeyboardView == null || mKeyboardView.isInSlidingKeyInput()) {
return;
}
AudioAndHapticFeedbackManager.getInstance().hapticAndAudioFeedback(code, mKeyboardView);
}
public void onLongPressTimeout(final int code) {
mState.onLongPressTimeout(code);
final Keyboard keyboard = getKeyboard();
if (keyboard != null && keyboard.mId.isAlphabetKeyboard() && code == Constants.CODE_SHIFT) {
hapticAndAudioFeedback(code);
}
}
public boolean isInMomentarySwitchState() {
return mState.isInMomentarySwitchState();
}
private boolean isVibrateAndSoundFeedbackRequired() {
return mKeyboardView != null && !mKeyboardView.isInSlidingKeyInput();
}
/**
* Updates state machine to figure out when to automatically switch back to the previous mode.
*/

2
java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
View File

@ -1008,7 +1008,7 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
tracker.onLongPressed();
invokeCodeInput(embeddedCode);
invokeReleaseKey(code);
KeyboardSwitcher.getInstance().hapticAndAudioFeedback(code);
AudioAndHapticFeedbackManager.getInstance().hapticAndAudioFeedback(code, this);
return;
}
if (code == Constants.CODE_SPACE || code == Constants.CODE_LANGUAGE_SWITCH) {

2
java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java
View File

@ -58,7 +58,6 @@ public final class KeyboardState {
public void cancelDoubleTapTimer();
public void startLongPressTimer(int code);
public void cancelLongPressTimer();
public void hapticAndAudioFeedback(int code);
}
private final SwitchActions mSwitchActions;
@ -387,7 +386,6 @@ public final class KeyboardState {
}
if (mIsAlphabetMode && code == Constants.CODE_SHIFT) {
mLongPressShiftLockFired = true;
mSwitchActions.hapticAndAudioFeedback(code);
}
}

3
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -480,6 +480,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
final InputAttributes inputAttributes =
new InputAttributes(getCurrentInputEditorInfo(), isFullscreenMode());
mSettings.loadSettings(locale, inputAttributes);
AudioAndHapticFeedbackManager.getInstance().onSettingsChanged(mSettings.getCurrent());
// May need to reset the contacts dictionary depending on the user settings.
resetContactsDictionary(null == mSuggest ? null : mSuggest.getContactsDictionary());
}
@ -2701,7 +2702,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION)) {
mSubtypeSwitcher.onNetworkStateChanged(intent);
} else if (action.equals(AudioManager.RINGER_MODE_CHANGED_ACTION)) {
mKeyboardSwitcher.onRingerModeChanged();
AudioAndHapticFeedbackManager.getInstance().onRingerModeChanged();
}
}
};

4
java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java
View File

@ -54,6 +54,7 @@ import com.android.inputmethod.keyboard.KeyboardSwitcher;
import com.android.inputmethod.keyboard.MainKeyboardView;
import com.android.inputmethod.keyboard.MoreKeysPanel;
import com.android.inputmethod.keyboard.ViewLayoutUtils;
import com.android.inputmethod.latin.AudioAndHapticFeedbackManager;
import com.android.inputmethod.latin.AutoCorrection;
import com.android.inputmethod.latin.CollectionUtils;
import com.android.inputmethod.latin.Constants;
@ -689,7 +690,8 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
@Override
public boolean onLongClick(final View view) {
KeyboardSwitcher.getInstance().hapticAndAudioFeedback(Constants.NOT_A_CODE);
AudioAndHapticFeedbackManager.getInstance().hapticAndAudioFeedback(
Constants.NOT_A_CODE, this);
return showMoreSuggestions();
}

5
tests/src/com/android/inputmethod/keyboard/internal/MockKeyboardSwitcher.java
View File

@ -149,11 +149,6 @@ public class MockKeyboardSwitcher implements KeyboardState.SwitchActions {
mLongPressTimeoutCode = 0;
}
@Override
public void hapticAndAudioFeedback(final int code) {
// Nothing to do.
}
public void onLongPressTimeout(final int code) {
// TODO: Handle simultaneous long presses.
if (mLongPressTimeoutCode == code) {