am 88c946af: am 194c6360: Merge "Swap keys: exclamation, question, period, comma."

* commit '88c946af0c8a8e07092be71a7b98957d021e499b':
  Swap keys: exclamation, question, period, comma.
This commit is contained in:
Ken Wakasa 2013-10-09 17:53:47 -07:00 committed by Android Git Automerger
commit 272a8b79d8
3 changed files with 20 additions and 20 deletions

View File

@ -21,8 +21,8 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
latin:keyLabel="\?" />
<Key
latin:keyLabel="!" />
<Key
latin:keyLabel="\?" />
</merge>

View File

@ -25,18 +25,18 @@
<case
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="&#x055D;"
latin:backgroundType="functional" />
<!-- U+0589: "։" ARMENIAN FULL STOP -->
<Key
latin:keyLabel="&#x0589;"
latin:keyLabelFlags="hasPopupHint"
latin:backgroundType="functional"
latin:moreKeys="!text/more_keys_for_punctuation" />
<!-- U+055D: "՝" ARMENIAN COMMA -->
<Key
latin:keyLabel="&#x055D;"
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>

View File

@ -53,10 +53,10 @@
<Key
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>