aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
Diffstat (limited to 'java/res')
-rw-r--r--java/res/xml-sw600dp/keys_comma_period.xml35
-rw-r--r--java/res/xml-sw600dp/keys_exclamation_question.xml6
-rw-r--r--java/res/xml-sw600dp/keys_pcqwerty4_right3.xml4
-rw-r--r--java/res/xml-sw600dp/rowkeys_pcqwerty1.xml2
-rw-r--r--java/res/xml/key_period.xml60
-rw-r--r--java/res/xml/key_styles_common.xml6
-rw-r--r--java/res/xml/keys_comma_period.xml87
-rw-r--r--java/res/xml/keys_comma_period_symbols.xml32
-rw-r--r--java/res/xml/keys_pcqwerty4_right3.xml4
-rw-r--r--java/res/xml/row_qwerty4.xml32
-rw-r--r--java/res/xml/row_symbols4.xml2
-rw-r--r--java/res/xml/row_symbols_shift4.xml2
-rw-r--r--java/res/xml/rowkeys_pcqwerty1.xml2
-rw-r--r--java/res/xml/rowkeys_pcqwerty1_shift.xml2
-rw-r--r--java/res/xml/rowkeys_symbols3.xml4
15 files changed, 117 insertions, 163 deletions
diff --git a/java/res/xml-sw600dp/keys_comma_period.xml b/java/res/xml-sw600dp/keys_comma_period.xml
index 7604e033d..5e8bbabb6 100644
--- a/java/res/xml-sw600dp/keys_comma_period.xml
+++ b/java/res/xml-sw600dp/keys_comma_period.xml
@@ -39,30 +39,13 @@
latin:keyStyle="hasShiftedLetterHintStyle" />
</case>
<case
- latin:languageCode="ar"
+ latin:languageCode="ar|fa"
>
<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:keyLabel="!text/keylabel_for_tablet_comma"
+ latin:keyHintLabel="!text/keyhintlabel_for_tablet_comma"
latin:keyLabelFlags="hasPopupHint"
- latin:moreKeys="!text/more_keys_for_apostrophe"
+ latin:moreKeys="!text/more_keys_for_tablet_comma"
latin:backgroundType="functional"
latin:keyStyle="hasShiftedLetterHintStyle" />
<Key
@@ -90,14 +73,12 @@
<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" />
+ latin:moreKeys="!text/more_keys_for_tablet_comma"
+ latin:backgroundType="functional" />
<Key
latin:keyLabel="."
- latin:keyHintLabel="!text/keyhintlabel_for_period"
- latin:backgroundType="functional"
- latin:moreKeys="!text/more_keys_for_period" />
+ latin:moreKeys="!text/more_keys_for_period"
+ latin:backgroundType="functional" />
</default>
</switch>
</merge>
diff --git a/java/res/xml-sw600dp/keys_exclamation_question.xml b/java/res/xml-sw600dp/keys_exclamation_question.xml
index cd38282ee..fd849222d 100644
--- a/java/res/xml-sw600dp/keys_exclamation_question.xml
+++ b/java/res/xml-sw600dp/keys_exclamation_question.xml
@@ -22,7 +22,9 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="!" />
+ latin:keyLabel="!"
+ latin:moreKeys="!text/more_keys_for_exclamation" />
<Key
- latin:keyLabel="\?" />
+ latin:keyLabel="\?"
+ latin:moreKeys="!text/more_keys_for_question" />
</merge>
diff --git a/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml b/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml
index 774ff8d05..46a1c85dc 100644
--- a/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml
+++ b/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml
@@ -40,7 +40,7 @@
latin:keyHintLabel="\?"
latin:additionalMoreKeys="\?"
latin:keyStyle="hasShiftedLetterHintStyle"
- latin:moreKeys="!text/more_keys_for_symbols_question" />
+ latin:moreKeys="!text/more_keys_for_question" />
</case>
<!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
<default>
@@ -58,7 +58,7 @@
latin:moreKeys="!fixedColumnOrder!3,&#x203A;,&#x2265;,&#x00BB;" />
<Key
latin:keyLabel="\?"
- latin:moreKeys="!text/more_keys_for_symbols_question" />
+ latin:moreKeys="!text/more_keys_for_question" />
</default>
</switch>
</merge>
diff --git a/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml b/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml
index 254d3fdba..ae6bab79c 100644
--- a/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml
+++ b/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml
@@ -31,7 +31,7 @@
latin:keyHintLabel="!"
latin:additionalMoreKeys="!"
latin:keyStyle="hasShiftedLetterHintStyle"
- latin:moreKeys="!text/more_keys_for_symbols_exclamation,!text/more_keys_for_symbols_1" />
+ latin:moreKeys="!text/more_keys_for_exclamation,!text/more_keys_for_symbols_1" />
<Key
latin:keyLabel="2"
latin:keyHintLabel="\@"
diff --git a/java/res/xml/key_period.xml b/java/res/xml/key_period.xml
new file mode 100644
index 000000000..7fc886d19
--- /dev/null
+++ b/java/res/xml/key_period.xml
@@ -0,0 +1,60 @@
+<?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:languageCode="ar|fa"
+ >
+ <Key
+ latin:keyLabel="."
+ latin:keyHintLabel="!text/keyhintlabel_for_arabic_diacritics"
+ latin:keyLabelFlags="hasPopupHint|hasShiftedLetterHint"
+ latin:moreKeys="!text/more_keys_for_arabic_diacritics"
+ latin:backgroundType="functional" />
+ </case>
+ <case
+ latin:languageCode="ne"
+ latin:keyboardLayoutSet="nepali_traditional"
+ >
+ <include
+ latin:keyboardLayout="@xml/key_nepali_traditional_period" />
+ </case>
+ <case
+ latin:languageCode="hy"
+ >
+ <!-- U+0589: "։" ARMENIAN FULL STOP -->
+ <Key
+ latin:keyLabel="&#x0589;"
+ latin:keyLabelFlags="hasPopupHint"
+ latin:moreKeys="!text/more_keys_for_punctuation"
+ latin:backgroundType="functional" />
+ </case>
+ <default>
+ <Key
+ latin:keyLabel="."
+ latin:keyLabelFlags="hasPopupHint"
+ latin:moreKeys="!text/more_keys_for_punctuation"
+ latin:backgroundType="functional" />
+ </default>
+ </switch>
+</merge>
diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml
index a3b6507ce..d538eb8c3 100644
--- a/java/res/xml/key_styles_common.xml
+++ b/java/res/xml/key_styles_common.xml
@@ -183,12 +183,6 @@
latin:code="!code/key_shift"
latin:parentStyle="baseForToSymbolKeyStyle" />
<key-style
- latin:styleName="punctuationKeyStyle"
- latin:keyLabel="."
- latin:keyLabelFlags="hasPopupHint"
- latin:moreKeys="!text/more_keys_for_punctuation"
- latin:backgroundType="functional" />
- <key-style
latin:styleName="comKeyStyle"
latin:keyLabel="!text/keylabel_for_popular_domain"
latin:keyLabelFlags="autoXScale|fontNormal|hasPopupHint|preserveCase"
diff --git a/java/res/xml/keys_comma_period.xml b/java/res/xml/keys_comma_period.xml
deleted file mode 100644
index 1b51e45ed..000000000
--- a/java/res/xml/keys_comma_period.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, 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: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>
diff --git a/java/res/xml/keys_comma_period_symbols.xml b/java/res/xml/keys_comma_period_symbols.xml
new file mode 100644
index 000000000..6465fedd1
--- /dev/null
+++ b/java/res/xml/keys_comma_period_symbols.xml
@@ -0,0 +1,32 @@
+<?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"
+>
+ <Key
+ latin:keyLabel=","
+ latin:backgroundType="functional" />
+ <!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
+ <Key
+ latin:keyLabel="."
+ latin:moreKeys="&#x2026;"
+ latin:backgroundType="functional" />
+</merge>
diff --git a/java/res/xml/keys_pcqwerty4_right3.xml b/java/res/xml/keys_pcqwerty4_right3.xml
index e6084cb45..a5d5a429c 100644
--- a/java/res/xml/keys_pcqwerty4_right3.xml
+++ b/java/res/xml/keys_pcqwerty4_right3.xml
@@ -34,7 +34,7 @@
<Key
latin:keyLabel="/"
latin:additionalMoreKeys="\?"
- latin:moreKeys="!text/more_keys_for_symbols_question" />
+ latin:moreKeys="!text/more_keys_for_question" />
</case>
<!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
<default>
@@ -52,7 +52,7 @@
latin:moreKeys="!fixedColumnOrder!3,&#x203A;,&#x2265;,&#x00BB;" />
<Key
latin:keyLabel="\?"
- latin:moreKeys="!text/more_keys_for_symbols_question" />
+ latin:moreKeys="!text/more_keys_for_question" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/row_qwerty4.xml b/java/res/xml/row_qwerty4.xml
index 578bc1234..509092d96 100644
--- a/java/res/xml/row_qwerty4.xml
+++ b/java/res/xml/row_qwerty4.xml
@@ -32,36 +32,8 @@
<include
latin:keyXPos="25%p"
latin:keyboardLayout="@xml/key_space_5kw" />
- <switch>
- <case
- latin:languageCode="ar|fa"
- >
- <Key
- latin:keyHintLabel="!text/keyhintlabel_for_arabic_diacritics"
- latin:keyLabelFlags="hasPopupHint|hasShiftedLetterHint"
- latin:moreKeys="!text/more_keys_for_arabic_diacritics"
- latin:keyStyle="punctuationKeyStyle" />
- </case>
- <case
- latin:languageCode="ne"
- latin:keyboardLayoutSet="nepali_traditional"
- >
- <include
- latin:keyboardLayout="@xml/key_nepali_traditional_period" />
- </case>
- <case
- latin:languageCode="hy"
- >
- <!-- U+0589: "։" ARMENIAN FULL STOP -->
- <Key
- latin:keyLabel="&#x0589;"
- latin:keyStyle="punctuationKeyStyle" />
- </case>
- <default>
- <Key
- latin:keyStyle="punctuationKeyStyle" />
- </default>
- </switch>
+ <include
+ latin:keyboardLayout="@xml/key_period" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
diff --git a/java/res/xml/row_symbols4.xml b/java/res/xml/row_symbols4.xml
index 73d93c89c..d2dd2e499 100644
--- a/java/res/xml/row_symbols4.xml
+++ b/java/res/xml/row_symbols4.xml
@@ -28,6 +28,6 @@
latin:keyLabel="/" />
<include latin:keyboardLayout="@xml/key_space_symbols" />
- <include latin:keyboardLayout="@xml/keys_comma_period" />
+ <include latin:keyboardLayout="@xml/keys_comma_period_symbols" />
</merge>
diff --git a/java/res/xml/row_symbols_shift4.xml b/java/res/xml/row_symbols_shift4.xml
index 0909374f4..f75575bc6 100644
--- a/java/res/xml/row_symbols_shift4.xml
+++ b/java/res/xml/row_symbols_shift4.xml
@@ -22,5 +22,5 @@
<include latin:keyboardLayout="@xml/keys_less_greater" />
<include
latin:keyboardLayout="@xml/key_space_symbols" />
- <include latin:keyboardLayout="@xml/keys_comma_period" />
+ <include latin:keyboardLayout="@xml/keys_comma_period_symbols" />
</merge>
diff --git a/java/res/xml/rowkeys_pcqwerty1.xml b/java/res/xml/rowkeys_pcqwerty1.xml
index de548d0ba..1ac264afa 100644
--- a/java/res/xml/rowkeys_pcqwerty1.xml
+++ b/java/res/xml/rowkeys_pcqwerty1.xml
@@ -26,7 +26,7 @@
latin:additionalMoreKeys="~" />
<Key
latin:keyLabel="1"
- latin:additionalMoreKeys="!,!text/more_keys_for_symbols_exclamation"
+ latin:additionalMoreKeys="!,!text/more_keys_for_exclamation"
latin:moreKeys="!text/more_keys_for_symbols_1" />
<Key
latin:keyLabel="2"
diff --git a/java/res/xml/rowkeys_pcqwerty1_shift.xml b/java/res/xml/rowkeys_pcqwerty1_shift.xml
index bc39f944e..718acfd24 100644
--- a/java/res/xml/rowkeys_pcqwerty1_shift.xml
+++ b/java/res/xml/rowkeys_pcqwerty1_shift.xml
@@ -25,7 +25,7 @@
latin:keyLabel="~" />
<Key
latin:keyLabel="!"
- latin:additionalMoreKeys="!text/more_keys_for_symbols_exclamation" />
+ latin:additionalMoreKeys="!text/more_keys_for_exclamation" />
<Key
latin:keyLabel="\@" />
<Key
diff --git a/java/res/xml/rowkeys_symbols3.xml b/java/res/xml/rowkeys_symbols3.xml
index 074078cb6..e525dc480 100644
--- a/java/res/xml/rowkeys_symbols3.xml
+++ b/java/res/xml/rowkeys_symbols3.xml
@@ -55,8 +55,8 @@
latin:moreKeys="!text/more_keys_for_symbols_semicolon" />
<Key
latin:keyLabel="!"
- latin:moreKeys="!text/more_keys_for_symbols_exclamation" />
+ latin:moreKeys="!text/more_keys_for_exclamation" />
<Key
latin:keyLabel="!text/keylabel_for_symbols_question"
- latin:moreKeys="!text/more_keys_for_symbols_question" />
+ latin:moreKeys="!text/more_keys_for_question" />
</merge>