nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

am 3dd81856: am a9f5c55c: am 382094a7: Merge "Cleanup and remove redundant more keys on phones"

Browse source 
* commit '3dd818565676f8a08b4bd29ba4909b1593a1d924':
  Cleanup and remove redundant more keys on phones
This commit is contained in:
Ken Wakasa 2013-10-09 19:31:56 -07:00 committed by Android Git Automerger
commit 72b4195360
8 changed files with 115 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
java/res/xml-sw600dp/keys_comma_period.xml Normal file
View file

@ -0,0 +1,103 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2013, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<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>
<case
latin:languageCode="ar"
>
<Key
latin:keyLabel="!text/keylabel_for_apostrophe"
latin:keyHintLabel="!text/keyhintlabel_for_apostrophe"
latin:moreKeys="!text/more_keys_for_apostrophe"
latin:backgroundType="functional"
latin:keyStyle="hasShiftedLetterHintStyle" />
<Key
latin:keyLabel="."
latin:keyHintLabel="!text/keyhintlabel_for_arabic_diacritics"
latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="!text/more_keys_for_arabic_diacritics"
latin:backgroundType="functional"
latin:keyStyle="hasShiftedLetterHintStyle" />
</case>
<case
latin:languageCode="fa"
>
<Key
latin:keyLabel="!text/keylabel_for_apostrophe"
latin:keyHintLabel="!text/keyhintlabel_for_apostrophe"
latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="!text/more_keys_for_apostrophe"
latin:backgroundType="functional"
latin:keyStyle="hasShiftedLetterHintStyle" />
<Key
latin:keyLabel="."
latin:keyHintLabel="!text/keyhintlabel_for_arabic_diacritics"
latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="!text/more_keys_for_arabic_diacritics"
latin:backgroundType="functional"
latin:keyStyle="hasShiftedLetterHintStyle" />
</case>
<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" />
</case>
<default>
<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_period"
latin:backgroundType="functional"
latin:moreKeys="!text/more_keys_for_period" />
</default>
</switch>
</merge>

20
java/res/xml/keys_comma_period.xml
View file

@ -22,22 +22,6 @@
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>
<case
latin:languageCode="ar"
>
@ -95,9 +79,9 @@
latin:moreKeys="!text/more_keys_for_tablet_comma" />
<Key
latin:keyLabel="."
latin:keyHintLabel="!text/keyhintlabel_for_tablet_period"
latin:keyHintLabel="!text/keyhintlabel_for_period"
latin:backgroundType="functional"
latin:moreKeys="!text/more_keys_for_tablet_period" />
latin:moreKeys="!text/more_keys_for_period" />
</default>
</switch>
</merge>

4
java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
View file

@ -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",

2
tools/make-keyboard-text/res/values-ca/donottranslate-more-keys.xml
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!4,&#x00B7;,!,\\,,\?,:,;,\@"</string>
<string name="more_keys_for_tablet_period">\?,&#x00B7;</string>
<string name="more_keys_for_period">\?,&#x00B7;</string>
<!-- U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA -->
<string name="keylabel_for_spanish_row2_10">&#x00E7;</string>
</resources>

2
tools/make-keyboard-text/res/values-es/donottranslate-more-keys.xml
View file

@ -75,7 +75,7 @@
<!-- U+00A1: "¡" INVERTED EXCLAMATION MARK -->
<string name="more_keys_for_tablet_comma">"!,&#x00A1;"</string>
<!-- U+00BF: "¿" INVERTED QUESTION MARK -->
<string name="more_keys_for_tablet_period">"\?,&#x00BF;"</string>
<string name="more_keys_for_period">"\?,&#x00BF;"</string>
<string name="keylabel_for_apostrophe">\"</string>
<string name="keyhintlabel_for_apostrophe">\'</string>
<string name="more_keys_for_apostrophe">\'</string>

4
tools/make-keyboard-text/res/values-fa/donottranslate-more-keys.xml
View file

@ -81,8 +81,8 @@
<string name="keylabel_for_tablet_comma">"&#x060C;"</string>
<string name="keyhintlabel_for_tablet_comma">"!"</string>
<string name="more_keys_for_tablet_comma">"!,\\,"</string>
<string name="keyhintlabel_for_tablet_period">"&#x061F;"</string>
<string name="more_keys_for_tablet_period">"&#x061F;,\?"</string>
<string name="keyhintlabel_for_period">"&#x061F;"</string>
<string name="more_keys_for_period">"&#x061F;,\?"</string>
<string name="keylabel_for_apostrophe">&#x060C;</string>
<string name="keyhintlabel_for_apostrophe">&#x061F;</string>
<string name="more_keys_for_apostrophe">"!fixedColumnOrder!4,:,!,&#x061F;,&#x061B;,-,/,&#x00AB;|&#x00BB;,&#x00BB;|&#x00AB;"</string>

4
tools/make-keyboard-text/res/values-iw/donottranslate-more-keys.xml
View file

@ -55,6 +55,6 @@
<string name="keylabel_for_currency">&#x20AA;</string>
<string name="keyhintlabel_for_tablet_comma">!</string>
<string name="more_keys_for_tablet_comma">!</string>
<string name="keyhintlabel_for_tablet_period">\?</string>
<string name="more_keys_for_tablet_period">\?</string>
<string name="keyhintlabel_for_period">\?</string>
<string name="more_keys_for_period">\?</string>
</resources>

4
tools/make-keyboard-text/res/values/donottranslate-more-keys.xml
View file

@ -169,9 +169,9 @@
<string name="keylabel_for_tablet_comma">,</string>
<string name="keyhintlabel_for_tablet_comma"></string>
<string name="more_keys_for_tablet_comma"></string>
<string name="keyhintlabel_for_tablet_period"></string>
<string name="keyhintlabel_for_period"></string>
<!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
<string name="more_keys_for_tablet_period">&#x2026;</string>
<string name="more_keys_for_period">&#x2026;</string>
<string name="keylabel_for_apostrophe">\'</string>
<string name="keyhintlabel_for_apostrophe">\"</string>
<string name="more_keys_for_apostrophe">\"</string>