aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/InputAttributes.java
diff options
context:
space:
mode:
authorSatoshi Kataoka <satok@google.com>2012-07-06 16:35:27 +0900
committerSatoshi Kataoka <satok@google.com>2012-07-06 16:35:27 +0900
commit46eea3c13f0e536c8cbd30c8d571de2a321e7a99 (patch)
treef88a62f73a40e8e715974eac8576cb7f49235cd8 /java/src/com/android/inputmethod/latin/InputAttributes.java
parentb8add1a24ea60d28bf2436f675326f34b6a13ac1 (diff)
parent362ea3cacbe1f19625f6a75e2bd7cd5de33fe0f2 (diff)
downloadlatinime-46eea3c13f0e536c8cbd30c8d571de2a321e7a99.tar.gz
latinime-46eea3c13f0e536c8cbd30c8d571de2a321e7a99.tar.xz
latinime-46eea3c13f0e536c8cbd30c8d571de2a321e7a99.zip
Merge remote-tracking branch 'goog/master' into mergescript
Conflicts: native/jni/Android.mk Change-Id: I5e4657b0949274ce29315a2c9047db428d5455af
Diffstat (limited to 'java/src/com/android/inputmethod/latin/InputAttributes.java')
-rw-r--r--java/src/com/android/inputmethod/latin/InputAttributes.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/InputAttributes.java b/java/src/com/android/inputmethod/latin/InputAttributes.java
index 229ae2f3c..9c32f947c 100644
--- a/java/src/com/android/inputmethod/latin/InputAttributes.java
+++ b/java/src/com/android/inputmethod/latin/InputAttributes.java
@@ -29,7 +29,6 @@ public class InputAttributes {
final public boolean mInputTypeNoAutoCorrect;
final public boolean mIsSettingsSuggestionStripOn;
final public boolean mApplicationSpecifiedCompletionOn;
- final public int mEditorAction;
public InputAttributes(final EditorInfo editorInfo, final boolean isFullscreenMode) {
final int inputType = null != editorInfo ? editorInfo.inputType : 0;
@@ -92,8 +91,6 @@ public class InputAttributes {
mApplicationSpecifiedCompletionOn = flagAutoComplete && isFullscreenMode;
}
- mEditorAction = (editorInfo == null) ? EditorInfo.IME_ACTION_UNSPECIFIED
- : editorInfo.imeOptions & EditorInfo.IME_MASK_ACTION;
}
@SuppressWarnings("unused")