diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2013-10-09 19:31:53 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-10-09 19:31:53 -0700 |
| commit | 3d87eff739304a788302b0250303370d3b85a8bd (patch) | |
| tree | 54cfd0f461166e7d62dd9c2b90def48e62b178b6 /java | |
| parent | 1fa00902b31e8ce12b1b78606cdd24815e7ce128 (diff) | |
| parent | 272a8b79d81f77f244a9836f3d02516bb29063e5 (diff) | |
| download | latinime-3d87eff739304a788302b0250303370d3b85a8bd.tar.gz latinime-3d87eff739304a788302b0250303370d3b85a8bd.tar.xz latinime-3d87eff739304a788302b0250303370d3b85a8bd.zip | |
am 272a8b79: am 88c946af: am 194c6360: Merge "Swap keys: exclamation, question, period, comma."
* commit '272a8b79d81f77f244a9836f3d02516bb29063e5':
Swap keys: exclamation, question, period, comma.
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/xml-sw600dp/keys_exclamation_question.xml | 4 | ||||
| -rw-r--r-- | java/res/xml/keys_comma_period.xml | 30 | ||||
| -rw-r--r-- | java/res/xml/rowkeys_symbols3.xml | 6 |
3 files changed, 20 insertions, 20 deletions
diff --git a/java/res/xml-sw600dp/keys_exclamation_question.xml b/java/res/xml-sw600dp/keys_exclamation_question.xml index 983ef3897..cd38282ee 100644 --- a/java/res/xml-sw600dp/keys_exclamation_question.xml +++ b/java/res/xml-sw600dp/keys_exclamation_question.xml @@ -22,7 +22,7 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Key - latin:keyLabel="\?" /> - <Key latin:keyLabel="!" /> + <Key + latin:keyLabel="\?" /> </merge> diff --git a/java/res/xml/keys_comma_period.xml b/java/res/xml/keys_comma_period.xml index 02b46c23a..00ede9eb3 100644 --- a/java/res/xml/keys_comma_period.xml +++ b/java/res/xml/keys_comma_period.xml @@ -26,17 +26,17 @@ latin:mode="email|url" > <Key - latin:keyLabel="." - latin:keyHintLabel="_" - latin:moreKeys="_" - latin:backgroundType="functional" - latin:keyStyle="hasShiftedLetterHintStyle" /> - <Key latin:keyLabel="," latin:keyHintLabel="-" latin:moreKeys="-" latin:backgroundType="functional" latin:keyStyle="hasShiftedLetterHintStyle" /> + <Key + latin:keyLabel="." + latin:keyHintLabel="_" + latin:moreKeys="_" + latin:backgroundType="functional" + latin:keyStyle="hasShiftedLetterHintStyle" /> </case> <case latin:languageCode="ar" @@ -76,28 +76,28 @@ <case latin:languageCode="hy" > + <!-- U+055D: "՝" ARMENIAN COMMA --> + <Key + latin:keyLabel="՝" + latin:backgroundType="functional" /> <!-- U+0589: "։" ARMENIAN FULL STOP --> <Key latin:keyLabel="։" latin:keyLabelFlags="hasPopupHint" latin:backgroundType="functional" latin:moreKeys="!text/more_keys_for_punctuation" /> - <!-- U+055D: "՝" ARMENIAN COMMA --> - <Key - latin:keyLabel="՝" - latin:backgroundType="functional" /> </case> <default> <Key - latin:keyLabel="." - latin:keyHintLabel="!text/keyhintlabel_for_tablet_period" - latin:backgroundType="functional" - latin:moreKeys="!text/more_keys_for_tablet_period" /> - <Key latin:keyLabel="!text/keylabel_for_tablet_comma" latin:keyHintLabel="!text/keyhintlabel_for_tablet_comma" latin:backgroundType="functional" latin:moreKeys="!text/more_keys_for_tablet_comma" /> + <Key + latin:keyLabel="." + latin:keyHintLabel="!text/keyhintlabel_for_tablet_period" + latin:backgroundType="functional" + latin:moreKeys="!text/more_keys_for_tablet_period" /> </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_symbols3.xml b/java/res/xml/rowkeys_symbols3.xml index 9f5e620e6..074078cb6 100644 --- a/java/res/xml/rowkeys_symbols3.xml +++ b/java/res/xml/rowkeys_symbols3.xml @@ -54,9 +54,9 @@ latin:keyLabel="!text/keylabel_for_symbols_semicolon" latin:moreKeys="!text/more_keys_for_symbols_semicolon" /> <Key - latin:keyLabel="!text/keylabel_for_symbols_question" - latin:moreKeys="!text/more_keys_for_symbols_question" /> - <Key latin:keyLabel="!" latin:moreKeys="!text/more_keys_for_symbols_exclamation" /> + <Key + latin:keyLabel="!text/keylabel_for_symbols_question" + latin:moreKeys="!text/more_keys_for_symbols_question" /> </merge> |