am 4d02aa4e: Add punctuations letters to period key on tablet

* commit '4d02aa4e8c9e0d23cde9b02530d3036a78f11403':
  Add punctuations letters to period key on tablet
main
Tadashi G. Takaoka 2013-12-06 01:43:37 -08:00 committed by Android Git Automerger
commit 696739803e
8 changed files with 390 additions and 432 deletions

View File

@ -29,7 +29,7 @@
<bool name="config_key_selection_by_dragging_finger">false</bool>
<!-- Showing more keys keyboard, just above the touched point if true, aligned to the key if
false -->
<bool name="config_show_more_keys_keyboard_at_touched_point">true</bool>
<bool name="config_show_more_keys_keyboard_at_touched_point">false</bool>
<!-- Preferable keyboard height in absolute scale: 48.0mm -->
<!-- This config_default_keyboard_height value should match with keyboard-heights.xml -->

View File

@ -22,35 +22,12 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<switch>
<case
latin:keyboardLayoutSetElement="symbols"
latin:mode="url"
>
<Key
latin:keyLabel=":" />
</case>
<case
latin:keyboardLayoutSetElement="symbols"
>
<Key
latin:keyLabel="\@" />
</case>
<!-- keyboardLayoutSetElement != "symbols" -->
<case
latin:mode="email"
>
<Key
latin:keyLabel="\@" />
</case>
<case
latin:mode="url"
>
<Key
latin:keyLabel="/"
latin:keyHintLabel=":"
latin:moreKeys=":"
latin:keyStyle="hasShiftedLetterHintStyle" />
</case>
<default>
<Key
latin:keyLabel="/" />

View File

@ -21,38 +21,18 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<switch>
<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" />
</case>
<default>
<Key
latin:keyLabel="!text/keylabel_for_tablet_comma"
latin:keyHintLabel="!text/keyhintlabel_for_tablet_comma"
latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="!text/more_keys_for_tablet_comma"
latin:backgroundType="functional"
latin:keyStyle="hasShiftedLetterHintStyle" />
<Key
latin:keyLabel="!text/keylabel_for_tablet_period"
latin:keyHintLabel="!text/keyhintlabel_for_tablet_period"
latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="!text/more_keys_for_tablet_period"
latin:backgroundType="functional"
latin:keyStyle="hasShiftedLetterHintStyle" />
</default>
</switch>
<Key
latin:keyLabel="!text/keylabel_for_tablet_comma"
latin:keyHintLabel="!text/keyhintlabel_for_tablet_comma"
latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="!text/more_keys_for_tablet_comma"
latin:backgroundType="functional"
latin:keyStyle="hasShiftedLetterHintStyle" />
<Key
latin:keyLabel="!text/keylabel_for_tablet_period"
latin:keyHintLabel="!text/keyhintlabel_for_tablet_period"
latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="!text/more_keys_for_tablet_period"
latin:backgroundType="functional"
latin:keyStyle="hasShiftedLetterHintStyle" />
</merge>

View File

@ -72,7 +72,7 @@
<string name="more_keys_for_l">l&#x00B7;l,&#x0142;</string>
<!-- U+00B7: "·" MIDDLE DOT -->
<string name="more_keys_for_punctuation">"!fixedColumnOrder!9,;,/,(,),#,&#x00B7;,!,\\,,\?,&amp;,\\%,+,\",-,:,',\@"</string>
<string name="more_keys_for_period">\?,&#x00B7;</string>
<string name="more_keys_for_tablet_punctuation">"!fixedColumnOrder!8,;,/,(,),#,&#x00B7;,',\\,,&amp;,\\%,+,\",-,:,\@"</string>
<!-- U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA -->
<string name="keylabel_for_spanish_row2_10">&#x00E7;</string>
</resources>

View File

@ -88,7 +88,6 @@
<string name="keyhintlabel_for_tablet_comma">"&#x061F;"</string>
<string name="more_keys_for_tablet_comma">"!fixedColumnOrder!4,:,!,&#x061F;,&#x061B;,-,/,&#x00AB;|&#x00BB;,&#x00BB;|&#x00AB;"</string>
<string name="keyhintlabel_for_period">"&#x061F;"</string>
<string name="more_keys_for_period">"&#x061F;,\?"</string>
<!-- U+FDFC: "﷼" RIAL SIGN -->
<string name="keylabel_for_currency">&#xFDFC;</string>
<!-- U+061F: "؟" ARABIC QUESTION MARK

View File

@ -29,6 +29,7 @@
U+FB29: "﬩" HEBREW LETTER ALTERNATIVE PLUS SIGN -->
<string name="more_keys_for_plus">&#x00B1;,&#xFB29;</string>
<string name="more_keys_for_punctuation">"!fixedColumnOrder!8,;,/,(|),)|(,#,!,\\,,\?,&amp;,\\%,+,\",-,:,',\@"</string>
<string name="more_keys_for_tablet_punctuation">"!fixedColumnOrder!7,;,/,(|),)|(,#,',\\,,&amp;,\\%,+,\",-,:,\@"</string>
<!-- The all letters need to be mirrored are found at
http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt -->
<string name="more_keys_for_left_parenthesis">!fixedColumnOrder!3,&lt;|&gt;,{|},[|]</string>

View File

@ -84,6 +84,7 @@
<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!8,;,/,(,),#,!,\\,,\?,&amp;,\\%,+,\",-,:,',\@"</string>
<string name="more_keys_for_tablet_punctuation">"!fixedColumnOrder!7,;,/,(,),#,',\\,,&amp;,\\%,+,\",-,:,\@"</string>
<!-- U+2020: "†" DAGGER
U+2021: "‡" DOUBLE DAGGER
U+2605: "★" BLACK STAR -->
@ -171,8 +172,7 @@
<string name="more_keys_for_period">!text/more_keys_for_punctuation</string>
<string name="keylabel_for_tablet_period">.</string>
<string name="keyhintlabel_for_tablet_period"></string>
<!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
<string name="more_keys_for_tablet_period">&#x2026;</string>
<string name="more_keys_for_tablet_period">!text/more_keys_for_tablet_punctuation</string>
<string name="keylabel_for_symbols_question">\?</string>
<string name="keylabel_for_symbols_semicolon">;</string>
<string name="keylabel_for_symbols_percent">%</string>