commit d454fcc2cf26f622a87e79fcbcef96a1d675fd29
author Tadashi G. Takaoka <takaoka@google.com> Tue Apr 24 23:22:26 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 24 23:22:26 2012 -0700
tree ce2ce09ec76cbd2f3b66e0470269759057672a2e
parent b7286439f6cf73c2dce8829b152132458e0e7a84
parent 96e404310deca42a6696abdcb3111d355815b547

Merge "Ignore unknown keyboard layout safely"

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

diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
index 9dc1786..cd3d3c0 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
@@ -427,8 +427,6 @@
         // http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt
         // U+FD3E: "﴾" ORNATE LEFT PARENTHESIS
         // U+FD3F: "﴿" ORNATE RIGHT PARENTHESIS
-        // TODO: DroidSansArabic lacks the glyph of U+FD3E ORNATE LEFT PARENTHESIS
-        // TODO: DroidSansArabic lacks the glyph of U+FD3F ORNATE RIGHT PARENTHESIS
         /* 53 */ "!fixedColumnOrder!4,\uFD3E|\uFD3F,<|>,{|},[|]",
         /* 54 */ "!fixedColumnOrder!4,\uFD3F|\uFD3E,>|<,}|{,]|[",
         // U+2264: "≤" LESS-THAN OR EQUAL TO
@@ -495,7 +493,7 @@
         /* 94 */ "?",
         /* 95 */ ";",
         // U+2030: "‰" PER MILLE SIGN
-        /* 96 */ "%,\u2030",
+        /* 96 */ "\\%,\u2030",
         /* 97~ */
         null, null, null, null, null,
         /* ~101 */
@@ -1031,8 +1029,6 @@
         // http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt
         // U+FD3E: "﴾" ORNATE LEFT PARENTHESIS
         // U+FD3F: "﴿" ORNATE RIGHT PARENTHESIS
-        // TODO: DroidSansArabic lacks the glyph of U+FD3E ORNATE LEFT PARENTHESIS
-        // TODO: DroidSansArabic lacks the glyph of U+FD3F ORNATE RIGHT PARENTHESIS
         /* 53 */ "!fixedColumnOrder!4,\uFD3E|\uFD3F,<|>,{|},[|]",
         /* 54 */ "!fixedColumnOrder!4,\uFD3F|\uFD3E,>|<,}|{,]|[",
         // U+2264: "≤" LESS-THAN OR EQUAL TO
@@ -1099,7 +1095,7 @@
         /* 94 */ "?",
         /* 95 */ ";",
         // U+2030: "‰" PER MILLE SIGN
-        /* 96 */ "%,\u2030",
+        /* 96 */ "\\%,\u2030",
         // U+060C: "،" ARABIC COMMA
         // U+061B: "؛" ARABIC SEMICOLON
         // U+061F: "؟" ARABIC QUESTION MARK

tools/maketext/res/values-ar/donottranslate-more-keys.xml

diff --git a/tools/maketext/res/values-ar/donottranslate-more-keys.xml b/tools/maketext/res/values-ar/donottranslate-more-keys.xml
index 402e171..b6b7294 100644
--- a/tools/maketext/res/values-ar/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-ar/donottranslate-more-keys.xml
@@ -80,7 +80,7 @@
     <string name="more_keys_for_symbols_question">\?</string>
     <string name="more_keys_for_symbols_semicolon">;</string>
     <!-- U+2030: "‰" PER MILLE SIGN -->
-    <string name="more_keys_for_symbols_percent">%,&#x2030;</string>
+    <string name="more_keys_for_symbols_percent">\\%,&#x2030;</string>
     <!-- U+060C: "،" ARABIC COMMA
          U+061B: "؛" ARABIC SEMICOLON
          U+061F: "؟" ARABIC QUESTION MARK -->
@@ -114,8 +114,6 @@
          http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt -->
     <!-- U+FD3E: "﴾" ORNATE LEFT PARENTHESIS
          U+FD3F: "﴿" ORNATE RIGHT PARENTHESIS -->
-    <!-- TODO: DroidSansArabic lacks the glyph of U+FD3E ORNATE LEFT PARENTHESIS -->
-    <!-- TODO: DroidSansArabic lacks the glyph of U+FD3F ORNATE RIGHT PARENTHESIS -->
     <string name="more_keys_for_left_parenthesis">!fixedColumnOrder!4,&#xFD3E;|&#xFD3F;,&lt;|&gt;,{|},[|]</string>
     <string name="more_keys_for_right_parenthesis">!fixedColumnOrder!4,&#xFD3F;|&#xFD3E;,&gt;|&lt;,}|{,]|[</string>
     <!-- U+2264: "≤" LESS-THAN OR EQUAL TO

tools/maketext/res/values-fa/donottranslate-more-keys.xml

diff --git a/tools/maketext/res/values-fa/donottranslate-more-keys.xml b/tools/maketext/res/values-fa/donottranslate-more-keys.xml
index 1da1c18..300017f 100644
--- a/tools/maketext/res/values-fa/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-fa/donottranslate-more-keys.xml
@@ -80,7 +80,7 @@
     <string name="more_keys_for_symbols_question">\?</string>
     <string name="more_keys_for_symbols_semicolon">;</string>
     <!-- U+2030: "‰" PER MILLE SIGN -->
-    <string name="more_keys_for_symbols_percent">%,&#x2030;</string>
+    <string name="more_keys_for_symbols_percent">\\%,&#x2030;</string>
     <!-- U+060C: "،" ARABIC COMMA
          U+061B: "؛" ARABIC SEMICOLON
          U+061F: "؟" ARABIC QUESTION MARK -->
@@ -116,8 +116,6 @@
          http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt -->
     <!-- U+FD3E: "﴾" ORNATE LEFT PARENTHESIS
          U+FD3F: "﴿" ORNATE RIGHT PARENTHESIS -->
-    <!-- TODO: DroidSansArabic lacks the glyph of U+FD3E ORNATE LEFT PARENTHESIS -->
-    <!-- TODO: DroidSansArabic lacks the glyph of U+FD3F ORNATE RIGHT PARENTHESIS -->
     <string name="more_keys_for_left_parenthesis">!fixedColumnOrder!4,&#xFD3E;|&#xFD3F;,&lt;|&gt;,{|},[|]</string>
     <string name="more_keys_for_right_parenthesis">!fixedColumnOrder!4,&#xFD3F;|&#xFD3E;,&gt;|&lt;,}|{,]|[</string>
     <!-- U+2264: "≤" LESS-THAN OR EQUAL TO