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

am 243e0347: Merge "Assign Key.mCode from the label only when outputText is not specified" 

* commit '243e0347169c857e08662bdc4d245473b6ea8097':
  Assign Key.mCode from the label only when outputText is not specified
main
Tadashi G. Takaoka 2011-12-11 23:34:31 -08:00 committed by Android Git Automerger
parent b73cd74e20 243e034716
commit cfc2b1c4f7
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java/src/com/android/inputmethod/keyboard/Key.java
View File

@ -22,6 +22,7 @@ import android.graphics.Rect;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log;
import android.util.Xml; import android.util.Xml;
import com.android.inputmethod.keyboard.internal.KeyStyles; import com.android.inputmethod.keyboard.internal.KeyStyles;
@ -42,6 +43,8 @@ import java.util.Map;
* Class for describing the position and characteristics of a single key in the keyboard. * Class for describing the position and characteristics of a single key in the keyboard.
*/ */
public class Key { public class Key {
private static final String TAG = Key.class.getSimpleName();
/** /**
* The key code (unicode or custom code) that this key generates. * The key code (unicode or custom code) that this key generates.
*/ */
@ -284,7 +287,11 @@ public class Key {
// specified. // specified.
final int code = style.getInt(keyAttr, R.styleable.Keyboard_Key_code, final int code = style.getInt(keyAttr, R.styleable.Keyboard_Key_code,
Keyboard.CODE_UNSPECIFIED); Keyboard.CODE_UNSPECIFIED);
if (code == Keyboard.CODE_UNSPECIFIED && !TextUtils.isEmpty(mLabel)) { if (code == Keyboard.CODE_UNSPECIFIED && mOutputText == null
&& !TextUtils.isEmpty(mLabel)) {
if (mLabel.length() != 1) {
Log.w(TAG, "Label is not a single letter: label=" + mLabel);
}
final int firstChar = mLabel.charAt(0); final int firstChar = mLabel.charAt(0);
mCode = getRtlParenthesisCode(firstChar, params.mIsRtlKeyboard); mCode = getRtlParenthesisCode(firstChar, params.mIsRtlKeyboard);
} else if (code != Keyboard.CODE_UNSPECIFIED) { } else if (code != Keyboard.CODE_UNSPECIFIED) {