summaryrefslogtreecommitdiff
path: root/java/src/com/android/inputmethod/keyboard/internal/ModifierKeyState.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-01-24 16:01:59 +0900
committerTadashi G. Takaoka <takaoka@google.com>2012-01-24 17:59:35 +0900
commit25971b5a14b378c4821fadd078e3cdaf8e07bb2a (patch)
treea571069124d6e696ff780fa2e2eed4ec3d8afac0 /java/src/com/android/inputmethod/keyboard/internal/ModifierKeyState.java
parent83d81f2e34b28e56bb0f8505d2315ae53c8f9eef (diff)
Clean up symbol key chording state from KeyboardState
Change-Id: I575da2bf2941c8a2e7b1fe0a455cbcdebb201276
Diffstat (limited to 'java/src/com/android/inputmethod/keyboard/internal/ModifierKeyState.java')
-rw-r--r--java/src/com/android/inputmethod/keyboard/internal/ModifierKeyState.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/internal/ModifierKeyState.java b/java/src/com/android/inputmethod/keyboard/internal/ModifierKeyState.java
index f95c91636..b39b97720 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/ModifierKeyState.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/ModifierKeyState.java
@@ -19,12 +19,12 @@ package com.android.inputmethod.keyboard.internal;
import android.util.Log;
/* package */ class ModifierKeyState {
- protected static final String TAG = "ModifierKeyState";
+ protected static final String TAG = ModifierKeyState.class.getSimpleName();
protected static final boolean DEBUG = false;
protected static final int RELEASING = 0;
protected static final int PRESSING = 1;
- protected static final int MOMENTARY = 2;
+ protected static final int CHORDING = 2;
protected final String mName;
protected int mState = RELEASING;
@@ -50,7 +50,7 @@ import android.util.Log;
public void onOtherKeyPressed() {
final int oldState = mState;
if (oldState == PRESSING)
- mState = MOMENTARY;
+ mState = CHORDING;
if (DEBUG)
Log.d(TAG, mName + ".onOtherKeyPressed: " + toString(oldState) + " > " + this);
}
@@ -63,8 +63,8 @@ import android.util.Log;
return mState == RELEASING;
}
- public boolean isMomentary() {
- return mState == MOMENTARY;
+ public boolean isChording() {
+ return mState == CHORDING;
}
@Override
@@ -76,7 +76,7 @@ import android.util.Log;
switch (state) {
case RELEASING: return "RELEASING";
case PRESSING: return "PRESSING";
- case MOMENTARY: return "MOMENTARY";
+ case CHORDING: return "CHORDING";
default: return "UNKNOWN";
}
}