aboutsummaryrefslogtreecommitdiffstats
path: root/java/res/xml-sw768dp
diff options
context:
space:
mode:
Diffstat (limited to 'java/res/xml-sw768dp')
-rw-r--r--java/res/xml-sw768dp/kbd_key_styles.xml24
-rw-r--r--java/res/xml-sw768dp/kbd_qwerty_row3.xml2
-rw-r--r--java/res/xml-sw768dp/kbd_qwerty_row4.xml37
-rw-r--r--java/res/xml-sw768dp/kbd_row3_comma_period.xml (renamed from java/res/xml-sw768dp/kbd_row3_right2.xml)0
-rw-r--r--java/res/xml-sw768dp/kbd_row4_apostrophe_dash.xml63
-rw-r--r--java/res/xml-sw768dp/kbd_rows_hebrew.xml47
-rw-r--r--java/res/xml-sw768dp/kbd_rows_russian.xml2
-rw-r--r--java/res/xml-sw768dp/kbd_rows_scandinavian.xml2
-rw-r--r--java/res/xml-sw768dp/kbd_rows_serbian.xml2
9 files changed, 112 insertions, 67 deletions
diff --git a/java/res/xml-sw768dp/kbd_key_styles.xml b/java/res/xml-sw768dp/kbd_key_styles.xml
index 4c1e3b63e..867a3bbe5 100644
--- a/java/res/xml-sw768dp/kbd_key_styles.xml
+++ b/java/res/xml-sw768dp/kbd_key_styles.xml
@@ -32,12 +32,24 @@
latin:keyIconShifted="iconShiftedShiftKey"
latin:parentStyle="functionalKeyStyle"
latin:isSticky="true" />
- <key-style
- latin:styleName="deleteKeyStyle"
- latin:code="@integer/key_delete"
- latin:keyIcon="iconDeleteKey"
- latin:parentStyle="functionalKeyStyle"
- latin:isRepeatable="true" />
+ <switch>
+ <case latin:languageCode="iw">
+ <key-style
+ latin:styleName="deleteKeyStyle"
+ latin:code="@integer/key_delete"
+ latin:keyIcon="iconDeleteRtlKey"
+ latin:parentStyle="functionalKeyStyle"
+ latin:isRepeatable="true" />
+ </case>
+ <default>
+ <key-style
+ latin:styleName="deleteKeyStyle"
+ latin:code="@integer/key_delete"
+ latin:keyIcon="iconDeleteKey"
+ latin:parentStyle="functionalKeyStyle"
+ latin:isRepeatable="true" />
+ </default>
+ </switch>
<key-style
latin:styleName="returnKeyStyle"
latin:code="@integer/key_return"
diff --git a/java/res/xml-sw768dp/kbd_qwerty_row3.xml b/java/res/xml-sw768dp/kbd_qwerty_row3.xml
index 7297ea512..9041a7764 100644
--- a/java/res/xml-sw768dp/kbd_qwerty_row3.xml
+++ b/java/res/xml-sw768dp/kbd_qwerty_row3.xml
@@ -47,7 +47,7 @@
<Key
latin:keyLabel="m" />
<include
- latin:keyboardLayout="@xml/kbd_row3_right2" />
+ latin:keyboardLayout="@xml/kbd_row3_comma_period" />
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-13.750%p"
diff --git a/java/res/xml-sw768dp/kbd_qwerty_row4.xml b/java/res/xml-sw768dp/kbd_qwerty_row4.xml
index bdef89dcc..48201c9ec 100644
--- a/java/res/xml-sw768dp/kbd_qwerty_row4.xml
+++ b/java/res/xml-sw768dp/kbd_qwerty_row4.xml
@@ -90,41 +90,14 @@
latin:keyWidth="37.500%p" />
<switch>
<case
- latin:mode="email"
+ latin:languageCode="iw"
>
- <Key
- latin:keyLabel="-" />
- </case>
- <case
- latin:mode="url"
- >
- <Key
- latin:keyLabel="/"
- latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLabel=":"
- latin:popupCharacters=":" />
- </case>
- <default>
- <Key
- latin:keyLabel="\'"
- latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLabel="&quot;"
- latin:popupCharacters="&quot;" />
- </default>
- </switch>
- <switch>
- <case
- latin:mode="email"
- >
- <Key
- latin:keyLabel="_" />
+ <include
+ latin:keyboardLayout="@xml/kbd_row3_comma_period" />
</case>
<default>
- <Key
- latin:keyLabel="-"
- latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLabel="_"
- latin:popupCharacters="_" />
+ <include
+ latin:keyboardLayout="@xml/kbd_row4_apostrophe_dash" />
</default>
</switch>
<switch>
diff --git a/java/res/xml-sw768dp/kbd_row3_right2.xml b/java/res/xml-sw768dp/kbd_row3_comma_period.xml
index 25453160f..25453160f 100644
--- a/java/res/xml-sw768dp/kbd_row3_right2.xml
+++ b/java/res/xml-sw768dp/kbd_row3_comma_period.xml
diff --git a/java/res/xml-sw768dp/kbd_row4_apostrophe_dash.xml b/java/res/xml-sw768dp/kbd_row4_apostrophe_dash.xml
new file mode 100644
index 000000000..402bb92f9
--- /dev/null
+++ b/java/res/xml-sw768dp/kbd_row4_apostrophe_dash.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2011, 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"
+ >
+ <Key
+ latin:keyLabel="-" />
+ </case>
+ <case
+ latin:mode="url"
+ >
+ <Key
+ latin:keyLabel="/"
+ latin:keyLabelOption="hasUppercaseLetter"
+ latin:keyHintLabel=":"
+ latin:popupCharacters=":" />
+ </case>
+ <default>
+ <Key
+ latin:keyLabel="\'"
+ latin:keyLabelOption="hasUppercaseLetter"
+ latin:keyHintLabel="&quot;"
+ latin:popupCharacters="&quot;" />
+ </default>
+ </switch>
+ <switch>
+ <case
+ latin:mode="email"
+ >
+ <Key
+ latin:keyLabel="_" />
+ </case>
+ <default>
+ <Key
+ latin:keyLabel="-"
+ latin:keyLabelOption="hasUppercaseLetter"
+ latin:keyHintLabel="_"
+ latin:popupCharacters="_" />
+ </default>
+ </switch>
+</merge>
diff --git a/java/res/xml-sw768dp/kbd_rows_hebrew.xml b/java/res/xml-sw768dp/kbd_rows_hebrew.xml
index 5275a1f15..0ef68b648 100644
--- a/java/res/xml-sw768dp/kbd_rows_hebrew.xml
+++ b/java/res/xml-sw768dp/kbd_rows_hebrew.xml
@@ -24,16 +24,15 @@
<include
latin:keyboardLayout="@xml/kbd_key_styles" />
<Row
- latin:keyWidth="8.000%p"
+ latin:keyWidth="8.282%p"
>
<Key
latin:keyStyle="tabKeyStyle"
latin:keyLabelOption="alignLeft"
+ latin:keyWidth="7.969%p"
latin:keyEdgeFlags="left" />
- <Key
- latin:keyLabel="," />
- <Key
- latin:keyLabel="." />
+ <include
+ latin:keyboardLayout="@xml/kbd_row4_apostrophe_dash" />
<Key
latin:keyLabel="ק" />
<Key
@@ -57,12 +56,12 @@
latin:keyEdgeFlags="right" />
</Row>
<Row
- latin:keyWidth="8.000%p"
+ latin:keyWidth="8.125%p"
>
<Key
latin:keyStyle="toSymbolKeyStyle"
latin:keyLabelOption="alignLeft"
- latin:keyWidth="9.600%p"
+ latin:keyWidth="11.172%p"
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="ש" />
@@ -70,39 +69,31 @@
latin:keyLabel="ד" />
<Key
latin:keyLabel="ג"
- latin:popupCharacters="ג,ג׳" />
+ latin:popupCharacters="ג׳" />
<Key
latin:keyLabel="כ" />
<Key
latin:keyLabel="ע" />
<Key
latin:keyLabel="י"
- latin:popupCharacters="י,ײַ" />
+ latin:popupCharacters="ײַ" />
<Key
latin:keyLabel="ח"
- latin:popupCharacters="ח,ח׳" />
+ latin:popupCharacters="ח׳" />
<Key
latin:keyLabel="ל" />
<Key
latin:keyLabel="ך" />
<Key
latin:keyLabel="ף" />
- <Key
- latin:keyStyle="returnKeyStyle"
- latin:keyXPos="-10.400%p"
- latin:keyWidth="fillBoth"
- latin:keyEdgeFlags="right" />
</Row>
<Row
- latin:keyWidth="8.000%p"
+ latin:keyWidth="8.047%p"
>
<Key
- latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="13.200%p"
- latin:keyEdgeFlags="left" />
- <Key
latin:keyLabel="ז"
- latin:popupCharacters="ז,ז׳" />
+ latin:popupCharacters="ז׳"
+ latin:keyXPos="13.829%p" />
<Key
latin:keyLabel="ס" />
<Key
@@ -115,13 +106,19 @@
latin:keyLabel="מ" />
<Key
latin:keyLabel="צ"
- latin:popupCharacters="צ,צ׳" />
+ latin:popupCharacters="צ׳" />
<Key
latin:keyLabel="ת"
- latin:popupCharacters="ת,ת׳" />
+ latin:popupCharacters="ת׳" />
<Key
latin:keyLabel="ץ"
- latin:popupCharacters="ץ,ץ׳" />
+ latin:popupCharacters="ץ׳" />
+ <Key
+ latin:keyStyle="returnKeyStyle"
+ latin:keyXPos="-10.400%p"
+ latin:keyWidth="fillBoth"
+ latin:keyEdgeFlags="right" />
</Row>
- <include latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ <include
+ latin:keyboardLayout="@xml/kbd_qwerty_row4" />
</merge>
diff --git a/java/res/xml-sw768dp/kbd_rows_russian.xml b/java/res/xml-sw768dp/kbd_rows_russian.xml
index ee91481c1..35b2c8a1a 100644
--- a/java/res/xml-sw768dp/kbd_rows_russian.xml
+++ b/java/res/xml-sw768dp/kbd_rows_russian.xml
@@ -123,7 +123,7 @@
<Key
latin:keyLabel="ю" />
<include
- latin:keyboardLayout="@xml/kbd_row3_right2" />
+ latin:keyboardLayout="@xml/kbd_row3_comma_period" />
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="fillBoth"
diff --git a/java/res/xml-sw768dp/kbd_rows_scandinavian.xml b/java/res/xml-sw768dp/kbd_rows_scandinavian.xml
index 7e9f604f5..c20dceea8 100644
--- a/java/res/xml-sw768dp/kbd_rows_scandinavian.xml
+++ b/java/res/xml-sw768dp/kbd_rows_scandinavian.xml
@@ -139,7 +139,7 @@
<Key
latin:keyLabel="m" />
<include
- latin:keyboardLayout="@xml/kbd_row3_right2" />
+ latin:keyboardLayout="@xml/kbd_row3_comma_period" />
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-12.750%p"
diff --git a/java/res/xml-sw768dp/kbd_rows_serbian.xml b/java/res/xml-sw768dp/kbd_rows_serbian.xml
index 4997dabb9..f1576de45 100644
--- a/java/res/xml-sw768dp/kbd_rows_serbian.xml
+++ b/java/res/xml-sw768dp/kbd_rows_serbian.xml
@@ -118,7 +118,7 @@
<Key
latin:keyLabel="м" />
<include
- latin:keyboardLayout="@xml/kbd_row3_right2" />
+ latin:keyboardLayout="@xml/kbd_row3_comma_period" />
<Key
latin:keyStyle="returnKeyStyle"
latin:keyXPos="-13.750%p"