From e56c2f979fc027abd50e7dd6325644b5b575ff63 Mon Sep 17 00:00:00 2001 From: Ken Wakasa Date: Tue, 1 Oct 2013 19:02:09 +0900 Subject: [PATCH] Cleanup and remove redundant more keys on phones Change-Id: I419c3c119eb1e4d2e877c8c00564e46f40b6abc2 --- java/res/xml-sw600dp/keys_comma_period.xml | 103 ++++++++++++++++++ java/res/xml/keys_comma_period.xml | 20 +--- .../keyboard/internal/KeyboardTextsSet.java | 4 +- .../values-ca/donottranslate-more-keys.xml | 2 +- .../values-es/donottranslate-more-keys.xml | 2 +- .../values-fa/donottranslate-more-keys.xml | 4 +- .../values-iw/donottranslate-more-keys.xml | 4 +- .../res/values/donottranslate-more-keys.xml | 4 +- 8 files changed, 115 insertions(+), 28 deletions(-) create mode 100644 java/res/xml-sw600dp/keys_comma_period.xml diff --git a/java/res/xml-sw600dp/keys_comma_period.xml b/java/res/xml-sw600dp/keys_comma_period.xml new file mode 100644 index 000000000..7604e033d --- /dev/null +++ b/java/res/xml-sw600dp/keys_comma_period.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/res/xml/keys_comma_period.xml b/java/res/xml/keys_comma_period.xml index 00ede9eb3..1b51e45ed 100644 --- a/java/res/xml/keys_comma_period.xml +++ b/java/res/xml/keys_comma_period.xml @@ -22,22 +22,6 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > - - - - @@ -95,9 +79,9 @@ latin:moreKeys="!text/more_keys_for_tablet_comma" /> + latin:moreKeys="!text/more_keys_for_period" /> diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java index 67553fb75..684cf632b 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java @@ -209,8 +209,8 @@ public final class KeyboardTextsSet { /* 104 */ "keylabel_for_tablet_comma", /* 105 */ "keyhintlabel_for_tablet_comma", /* 106 */ "more_keys_for_tablet_comma", - /* 107 */ "keyhintlabel_for_tablet_period", - /* 108 */ "more_keys_for_tablet_period", + /* 107 */ "keyhintlabel_for_period", + /* 108 */ "more_keys_for_period", /* 109 */ "keylabel_for_apostrophe", /* 110 */ "keyhintlabel_for_apostrophe", /* 111 */ "more_keys_for_apostrophe", diff --git a/tools/make-keyboard-text/res/values-ca/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-ca/donottranslate-more-keys.xml index 9728c9963..4cf742441 100644 --- a/tools/make-keyboard-text/res/values-ca/donottranslate-more-keys.xml +++ b/tools/make-keyboard-text/res/values-ca/donottranslate-more-keys.xml @@ -72,7 +72,7 @@ l·l,ł "!fixedColumnOrder!4,·,!,\\,,\?,:,;,\@" - \?,· + \?,· ç diff --git a/tools/make-keyboard-text/res/values-es/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-es/donottranslate-more-keys.xml index 849429629..8e6b4ee06 100644 --- a/tools/make-keyboard-text/res/values-es/donottranslate-more-keys.xml +++ b/tools/make-keyboard-text/res/values-es/donottranslate-more-keys.xml @@ -75,7 +75,7 @@ "!,¡" - "\?,¿" + "\?,¿" \" \' \' diff --git a/tools/make-keyboard-text/res/values-fa/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-fa/donottranslate-more-keys.xml index 5a03c803c..ab4fbda44 100644 --- a/tools/make-keyboard-text/res/values-fa/donottranslate-more-keys.xml +++ b/tools/make-keyboard-text/res/values-fa/donottranslate-more-keys.xml @@ -81,8 +81,8 @@ "،" "!" "!,\\," - "؟" - "؟,\?" + "؟" + "؟,\?" ، ؟ "!fixedColumnOrder!4,:,!,؟,؛,-,/,«|»,»|«" diff --git a/tools/make-keyboard-text/res/values-iw/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-iw/donottranslate-more-keys.xml index feaed4c98..a1633316f 100644 --- a/tools/make-keyboard-text/res/values-iw/donottranslate-more-keys.xml +++ b/tools/make-keyboard-text/res/values-iw/donottranslate-more-keys.xml @@ -55,6 +55,6 @@ ! ! - \? - \? + \? + \? 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 cc09f7fe5..44aa64cbe 100644 --- a/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml +++ b/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml @@ -169,9 +169,9 @@ , - + - + \' \" \"