aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2013-10-09 21:25:49 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-09 21:25:49 -0700
commit07baf17c6f6fff0725c75f4ba778d5a26a6eea67 (patch)
tree40f1de3369f6e1fd63649b243b8726c3bffde12f
parent49d8b8cacd18cc0ca7c5c0faa531b3b41c7093e3 (diff)
parentf9d7d17f8fe9aa30346a1e3c8d01163aac58098b (diff)
downloadlatinime-07baf17c6f6fff0725c75f4ba778d5a26a6eea67.tar.gz
latinime-07baf17c6f6fff0725c75f4ba778d5a26a6eea67.tar.xz
latinime-07baf17c6f6fff0725c75f4ba778d5a26a6eea67.zip
am f9d7d17f: Merge "Retry to tweak punctuations. DO NOT MERGE" into klp-dev
* commit 'f9d7d17f8fe9aa30346a1e3c8d01163aac58098b': Retry to tweak punctuations. DO NOT MERGE
-rw-r--r--java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java2
-rw-r--r--tools/make-keyboard-text/res/values/donottranslate-more-keys.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
index bcb80b455..e769e3cdd 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
@@ -278,7 +278,7 @@ public final class KeyboardTextsSet {
/* 50 */ "\u00A2,\u00A3,\u20AC,\u00A5,\u20B1",
/* 51 */ "$",
/* 52 */ "$,\u00A2,\u20AC,\u00A3,\u00A5,\u20B1",
- /* 53 */ "!fixedColumnOrder!3,!,\\,,?,:,;,@",
+ /* 53 */ "!fixedColumnOrder!4,#,!,\\,,?,-,:,',@",
// U+2020: "†" DAGGER
// U+2021: "‡" DOUBLE DAGGER
// U+2605: "★" BLACK STAR
diff --git a/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml
index 39ecfab22..64396b1dd 100644
--- a/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml
@@ -77,7 +77,7 @@
<string name="more_keys_for_currency_dollar">&#x00A2;,&#x00A3;,&#x20AC;,&#x00A5;,&#x20B1;</string>
<string name="keylabel_for_currency">$</string>
<string name="more_keys_for_currency">$,&#x00A2;,&#x20AC;,&#x00A3;,&#x00A5;,&#x20B1;</string>
- <string name="more_keys_for_punctuation">"!fixedColumnOrder!3,!,\\,,\?,:,;,\@"</string>
+ <string name="more_keys_for_punctuation">"!fixedColumnOrder!4,#,!,\\,,\?,-,:,',\@"</string>
<!-- U+2020: "†" DAGGER
U+2021: "‡" DOUBLE DAGGER
U+2605: "★" BLACK STAR -->