am c6c17b93: am 962c9f05: Merge "Small cleanup"

* commit 'c6c17b933270d994caa127ba9ca96ecf35898a88':
  Small cleanup
This commit is contained in:
Jean Chalard 2013-04-17 19:47:31 -07:00 committed by Android Git Automerger
commit 7f8e55ec80

View file

@ -30,7 +30,7 @@ import com.android.inputmethod.latin.RecapitalizeStatus;
* The input events are {@link #onLoadKeyboard()}, {@link #onSaveKeyboardState()}, * The input events are {@link #onLoadKeyboard()}, {@link #onSaveKeyboardState()},
* {@link #onPressKey(int, boolean, int)}, {@link #onReleaseKey(int, boolean)}, * {@link #onPressKey(int, boolean, int)}, {@link #onReleaseKey(int, boolean)},
* {@link #onCodeInput(int, boolean, int)}, {@link #onCancelInput(boolean)}, * {@link #onCodeInput(int, boolean, int)}, {@link #onCancelInput(boolean)},
* {@link #onUpdateShiftState(int)}, {@link #onLongPressTimeout(int)}. * {@link #onUpdateShiftState(int, int)}, {@link #onLongPressTimeout(int)}.
* *
* The actions are {@link SwitchActions}'s methods. * The actions are {@link SwitchActions}'s methods.
*/ */
@ -49,7 +49,7 @@ public final class KeyboardState {
public void setSymbolsShiftedKeyboard(); public void setSymbolsShiftedKeyboard();
/** /**
* Request to call back {@link KeyboardState#onUpdateShiftState(int)}. * Request to call back {@link KeyboardState#onUpdateShiftState(int, int)}.
*/ */
public void requestUpdatingShiftState(); public void requestUpdatingShiftState();
@ -393,7 +393,7 @@ public final class KeyboardState {
public void onUpdateShiftState(final int autoCaps, final int recapitalizeMode) { public void onUpdateShiftState(final int autoCaps, final int recapitalizeMode) {
if (DEBUG_EVENT) { if (DEBUG_EVENT) {
Log.d(TAG, "onUpdateShiftState: autoCaps=" + autoCaps + ", recapitalizeMode=" Log.d(TAG, "onUpdateShiftState: autoCaps=" + autoCaps + ", recapitalizeMode="
+ recapitalizeMode + this); + recapitalizeMode + " " + this);
} }
mRecapitalizeMode = recapitalizeMode; mRecapitalizeMode = recapitalizeMode;
updateAlphabetShiftState(autoCaps, recapitalizeMode); updateAlphabetShiftState(autoCaps, recapitalizeMode);