commit e26f0d4320b9f3ad49a5c6d3f5f2ee78bac74a48
author Jean Chalard <jchalard@google.com> Tue Feb 12 06:49:39 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 12 06:49:41 2013 +0000
tree c88ef87b279656d219f93a442bccfe84084a14a7
parent 4cbe84ad08f38bf9c6f8852b406f5052e862a747
parent 1c5b2a41ecf118a2d0103bba7747c35329b2e0ee

Merge "Cleanups"

java/res/values/dictionary-pack.xml

diff --git a/java/res/values/dictionary-pack.xml b/java/res/values/dictionary-pack.xml
index 8ed543c..4109bcb 100644
--- a/java/res/values/dictionary-pack.xml
+++ b/java/res/values/dictionary-pack.xml
@@ -18,6 +18,6 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dictionary_pack_client_id">com.android.inputmethod.latin</string>
-    <string name="dictionary_pack_metadata_uri"></string>
+    <string name="dictionary_pack_client_id" translatable="false">com.android.inputmethod.latin</string>
+    <string name="dictionary_pack_metadata_uri" translatable="false"></string>
 </resources>

java/src/com/android/inputmethod/keyboard/internal/KeyboardCodesSet.java

diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardCodesSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardCodesSet.java
index 6ad9d28..0ec6b01 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardCodesSet.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardCodesSet.java
@@ -74,6 +74,7 @@
     private static final int CODE_LEFT_CURLY_BRACKET = '{';
     private static final int CODE_RIGHT_CURLY_BRACKET = '}';
 
+    // This array should be aligned with the array RTL below.
     private static final int[] DEFAULT = {
         Constants.CODE_TAB,
         Constants.CODE_ENTER,
@@ -117,6 +118,7 @@
         DEFAULT[12],
         DEFAULT[13],
         DEFAULT[14],
+        DEFAULT[15],
         CODE_RIGHT_PARENTHESIS,
         CODE_LEFT_PARENTHESIS,
         CODE_GREATER_THAN_SIGN,
@@ -140,6 +142,9 @@
     };
 
     static {
+        if (DEFAULT.length != RTL.length) {
+            throw new RuntimeException("Internal inconsistency");
+        }
         for (int i = 0; i < ID_TO_NAME.length; i++) {
             sNameToIdMap.put(ID_TO_NAME[i], i);
         }