commit 86344836ee34a683824689837cd5714e76e3f4a2
author Jean Chalard <jchalard@google.com> Sun Dec 11 21:26:31 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Sun Dec 11 21:26:31 2011 -0800
tree b307f20784708ae89d6f62e1e235160aaa912b48
parent 2ba1bcccddbd3be173e72bc49de074339d95b46a
parent 3651220327c051d8017045aa5e8919461507b3f8

Merge "Remove a duplicated variable."

java/src/com/android/inputmethod/keyboard/Keyboard.java

diff --git a/java/src/com/android/inputmethod/keyboard/Keyboard.java b/java/src/com/android/inputmethod/keyboard/Keyboard.java
index 2bc140e..f234507 100644
--- a/java/src/com/android/inputmethod/keyboard/Keyboard.java
+++ b/java/src/com/android/inputmethod/keyboard/Keyboard.java
@@ -71,7 +71,6 @@
     public static final int CODE_SHIFT = -1;
     public static final int CODE_SWITCH_ALPHA_SYMBOL = -2;
     public static final int CODE_CAPSLOCK = -3;
-    public static final int CODE_CANCEL = -4;
     public static final int CODE_DELETE = -5;
     public static final int CODE_SETTINGS = -6;
     public static final int CODE_SHORTCUT = -7;

java/src/com/android/inputmethod/latin/LatinIME.java

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index c47cae1..610a383 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1334,11 +1334,6 @@
                 switcher.toggleAlphabetAndSymbols();
             }
             break;
-        case Keyboard.CODE_CANCEL:
-            if (!isShowingOptionDialog()) {
-                handleClose();
-            }
-            break;
         case Keyboard.CODE_SETTINGS:
             onSettingsKeyPressed();
             break;