am a9f5c55c: am 382094a7: Merge "Cleanup and remove redundant more keys on phones"
* commit 'a9f5c55ca2f075ed6923e0040fa66c07a5a37176': Cleanup and remove redundant more keys on phonesmain
commit
3dd8185656
|
@ -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="՝"
|
||||||
|
latin:backgroundType="functional" />
|
||||||
|
<!-- U+0589: "։" ARMENIAN FULL STOP -->
|
||||||
|
<Key
|
||||||
|
latin:keyLabel="։"
|
||||||
|
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>
|
|
@ -22,22 +22,6 @@
|
||||||
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
|
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
|
||||||
>
|
>
|
||||||
<switch>
|
<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
|
<case
|
||||||
latin:languageCode="ar"
|
latin:languageCode="ar"
|
||||||
>
|
>
|
||||||
|
@ -95,9 +79,9 @@
|
||||||
latin:moreKeys="!text/more_keys_for_tablet_comma" />
|
latin:moreKeys="!text/more_keys_for_tablet_comma" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="."
|
latin:keyLabel="."
|
||||||
latin:keyHintLabel="!text/keyhintlabel_for_tablet_period"
|
latin:keyHintLabel="!text/keyhintlabel_for_period"
|
||||||
latin:backgroundType="functional"
|
latin:backgroundType="functional"
|
||||||
latin:moreKeys="!text/more_keys_for_tablet_period" />
|
latin:moreKeys="!text/more_keys_for_period" />
|
||||||
</default>
|
</default>
|
||||||
</switch>
|
</switch>
|
||||||
</merge>
|
</merge>
|
||||||
|
|
|
@ -209,8 +209,8 @@ public final class KeyboardTextsSet {
|
||||||
/* 104 */ "keylabel_for_tablet_comma",
|
/* 104 */ "keylabel_for_tablet_comma",
|
||||||
/* 105 */ "keyhintlabel_for_tablet_comma",
|
/* 105 */ "keyhintlabel_for_tablet_comma",
|
||||||
/* 106 */ "more_keys_for_tablet_comma",
|
/* 106 */ "more_keys_for_tablet_comma",
|
||||||
/* 107 */ "keyhintlabel_for_tablet_period",
|
/* 107 */ "keyhintlabel_for_period",
|
||||||
/* 108 */ "more_keys_for_tablet_period",
|
/* 108 */ "more_keys_for_period",
|
||||||
/* 109 */ "keylabel_for_apostrophe",
|
/* 109 */ "keylabel_for_apostrophe",
|
||||||
/* 110 */ "keyhintlabel_for_apostrophe",
|
/* 110 */ "keyhintlabel_for_apostrophe",
|
||||||
/* 111 */ "more_keys_for_apostrophe",
|
/* 111 */ "more_keys_for_apostrophe",
|
||||||
|
|
|
@ -72,7 +72,7 @@
|
||||||
<string name="more_keys_for_l">l·l,ł</string>
|
<string name="more_keys_for_l">l·l,ł</string>
|
||||||
<!-- U+00B7: "·" MIDDLE DOT -->
|
<!-- U+00B7: "·" MIDDLE DOT -->
|
||||||
<string name="more_keys_for_punctuation">"!fixedColumnOrder!4,·,!,\\,,\?,:,;,\@"</string>
|
<string name="more_keys_for_punctuation">"!fixedColumnOrder!4,·,!,\\,,\?,:,;,\@"</string>
|
||||||
<string name="more_keys_for_tablet_period">\?,·</string>
|
<string name="more_keys_for_period">\?,·</string>
|
||||||
<!-- U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA -->
|
<!-- U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA -->
|
||||||
<string name="keylabel_for_spanish_row2_10">ç</string>
|
<string name="keylabel_for_spanish_row2_10">ç</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -75,7 +75,7 @@
|
||||||
<!-- U+00A1: "¡" INVERTED EXCLAMATION MARK -->
|
<!-- U+00A1: "¡" INVERTED EXCLAMATION MARK -->
|
||||||
<string name="more_keys_for_tablet_comma">"!,¡"</string>
|
<string name="more_keys_for_tablet_comma">"!,¡"</string>
|
||||||
<!-- U+00BF: "¿" INVERTED QUESTION MARK -->
|
<!-- U+00BF: "¿" INVERTED QUESTION MARK -->
|
||||||
<string name="more_keys_for_tablet_period">"\?,¿"</string>
|
<string name="more_keys_for_period">"\?,¿"</string>
|
||||||
<string name="keylabel_for_apostrophe">\"</string>
|
<string name="keylabel_for_apostrophe">\"</string>
|
||||||
<string name="keyhintlabel_for_apostrophe">\'</string>
|
<string name="keyhintlabel_for_apostrophe">\'</string>
|
||||||
<string name="more_keys_for_apostrophe">\'</string>
|
<string name="more_keys_for_apostrophe">\'</string>
|
||||||
|
|
|
@ -81,8 +81,8 @@
|
||||||
<string name="keylabel_for_tablet_comma">"،"</string>
|
<string name="keylabel_for_tablet_comma">"،"</string>
|
||||||
<string name="keyhintlabel_for_tablet_comma">"!"</string>
|
<string name="keyhintlabel_for_tablet_comma">"!"</string>
|
||||||
<string name="more_keys_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>
|
||||||
<string name="more_keys_for_tablet_period">"؟,\?"</string>
|
<string name="more_keys_for_period">"؟,\?"</string>
|
||||||
<string name="keylabel_for_apostrophe">،</string>
|
<string name="keylabel_for_apostrophe">،</string>
|
||||||
<string name="keyhintlabel_for_apostrophe">؟</string>
|
<string name="keyhintlabel_for_apostrophe">؟</string>
|
||||||
<string name="more_keys_for_apostrophe">"!fixedColumnOrder!4,:,!,؟,؛,-,/,«|»,»|«"</string>
|
<string name="more_keys_for_apostrophe">"!fixedColumnOrder!4,:,!,؟,؛,-,/,«|»,»|«"</string>
|
||||||
|
|
|
@ -55,6 +55,6 @@
|
||||||
<string name="keylabel_for_currency">₪</string>
|
<string name="keylabel_for_currency">₪</string>
|
||||||
<string name="keyhintlabel_for_tablet_comma">!</string>
|
<string name="keyhintlabel_for_tablet_comma">!</string>
|
||||||
<string name="more_keys_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>
|
||||||
<string name="more_keys_for_tablet_period">\?</string>
|
<string name="more_keys_for_period">\?</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -169,9 +169,9 @@
|
||||||
<string name="keylabel_for_tablet_comma">,</string>
|
<string name="keylabel_for_tablet_comma">,</string>
|
||||||
<string name="keyhintlabel_for_tablet_comma"></string>
|
<string name="keyhintlabel_for_tablet_comma"></string>
|
||||||
<string name="more_keys_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 -->
|
<!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
|
||||||
<string name="more_keys_for_tablet_period">…</string>
|
<string name="more_keys_for_period">…</string>
|
||||||
<string name="keylabel_for_apostrophe">\'</string>
|
<string name="keylabel_for_apostrophe">\'</string>
|
||||||
<string name="keyhintlabel_for_apostrophe">\"</string>
|
<string name="keyhintlabel_for_apostrophe">\"</string>
|
||||||
<string name="more_keys_for_apostrophe">\"</string>
|
<string name="more_keys_for_apostrophe">\"</string>
|
||||||
|
|
Loading…
Reference in New Issue