aboutsummaryrefslogtreecommitdiffstats
path: root/java/res/xml-sw600dp
diff options
context:
space:
mode:
Diffstat (limited to 'java/res/xml-sw600dp')
-rw-r--r--java/res/xml-sw600dp/kbd_10_10_7_symbols.xml (renamed from java/res/xml-sw600dp/kbd_azerty_symbols.xml)0
-rw-r--r--java/res/xml-sw600dp/kbd_10_10_7_symbols_shift.xml (renamed from java/res/xml-sw600dp/kbd_azerty_symbols_shift.xml)0
-rw-r--r--java/res/xml-sw600dp/kbd_spanish_symbols_shift.xml26
-rw-r--r--java/res/xml-sw600dp/key_apostrophe.xml (renamed from java/res/xml-sw600dp/keys_apostrophe_dash.xml)17
-rw-r--r--java/res/xml-sw600dp/key_dash.xml (renamed from java/res/xml-sw600dp/kbd_hebrew_symbols.xml)21
-rw-r--r--java/res/xml-sw600dp/key_f1.xml (renamed from java/res/xml-sw600dp/kbd_spanish_symbols.xml)27
-rw-r--r--java/res/xml-sw600dp/key_space.xml (renamed from java/res/xml-sw600dp/kbd_hebrew_symbols_shift.xml)24
-rw-r--r--java/res/xml-sw600dp/row_qwerty4.xml47
-rw-r--r--java/res/xml-sw600dp/row_symbols4.xml (renamed from java/res/xml-sw600dp/rows_symbols4.xml)0
-rw-r--r--java/res/xml-sw600dp/row_symbols_shift4.xml (renamed from java/res/xml-sw600dp/rows_symbols_shift4.xml)0
-rw-r--r--java/res/xml-sw600dp/rows_10_10_7_symbols.xml2
-rw-r--r--java/res/xml-sw600dp/rows_10_10_7_symbols_shift.xml2
-rw-r--r--java/res/xml-sw600dp/rows_hebrew.xml4
-rw-r--r--java/res/xml-sw600dp/rows_symbols.xml2
-rw-r--r--java/res/xml-sw600dp/rows_symbols_shift.xml2
15 files changed, 75 insertions, 99 deletions
diff --git a/java/res/xml-sw600dp/kbd_azerty_symbols.xml b/java/res/xml-sw600dp/kbd_10_10_7_symbols.xml
index 66254dea0..66254dea0 100644
--- a/java/res/xml-sw600dp/kbd_azerty_symbols.xml
+++ b/java/res/xml-sw600dp/kbd_10_10_7_symbols.xml
diff --git a/java/res/xml-sw600dp/kbd_azerty_symbols_shift.xml b/java/res/xml-sw600dp/kbd_10_10_7_symbols_shift.xml
index 3c5ed5e09..3c5ed5e09 100644
--- a/java/res/xml-sw600dp/kbd_azerty_symbols_shift.xml
+++ b/java/res/xml-sw600dp/kbd_10_10_7_symbols_shift.xml
diff --git a/java/res/xml-sw600dp/kbd_spanish_symbols_shift.xml b/java/res/xml-sw600dp/kbd_spanish_symbols_shift.xml
deleted file mode 100644
index 3c5ed5e09..000000000
--- a/java/res/xml-sw600dp/kbd_spanish_symbols_shift.xml
+++ /dev/null
@@ -1,26 +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.
-*/
--->
-
-<Keyboard
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/rows_10_10_7_symbols_shift" />
-</Keyboard>
diff --git a/java/res/xml-sw600dp/keys_apostrophe_dash.xml b/java/res/xml-sw600dp/key_apostrophe.xml
index badc6e516..7da4b6223 100644
--- a/java/res/xml-sw600dp/keys_apostrophe_dash.xml
+++ b/java/res/xml-sw600dp/key_apostrophe.xml
@@ -2,7 +2,7 @@
<!--
/*
**
-** Copyright 2011, The Android Open Source Project
+** 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.
@@ -45,19 +45,4 @@
latin:keyStyle="hasShiftedLetterHintStyle" />
</default>
</switch>
- <switch>
- <case
- latin:mode="email"
- >
- <Key
- latin:keyLabel="_" />
- </case>
- <default>
- <Key
- latin:keyLabel="!text/keylabel_for_dash"
- latin:keyHintLabel="!text/keyhintlabel_for_dash"
- latin:moreKeys="!text/more_keys_for_dash"
- latin:keyStyle="hasShiftedLetterHintStyle" />
- </default>
- </switch>
</merge>
diff --git a/java/res/xml-sw600dp/kbd_hebrew_symbols.xml b/java/res/xml-sw600dp/key_dash.xml
index 66254dea0..a7c3727da 100644
--- a/java/res/xml-sw600dp/kbd_hebrew_symbols.xml
+++ b/java/res/xml-sw600dp/key_dash.xml
@@ -18,9 +18,22 @@
*/
-->
-<Keyboard
+<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
- <include
- latin:keyboardLayout="@xml/rows_10_10_7_symbols" />
-</Keyboard>
+ <switch>
+ <case
+ latin:mode="email"
+ >
+ <Key
+ latin:keyLabel="_" />
+ </case>
+ <default>
+ <Key
+ latin:keyLabel="!text/keylabel_for_dash"
+ latin:keyHintLabel="!text/keyhintlabel_for_dash"
+ latin:moreKeys="!text/more_keys_for_dash"
+ latin:keyStyle="hasShiftedLetterHintStyle" />
+ </default>
+ </switch>
+</merge>
diff --git a/java/res/xml-sw600dp/kbd_spanish_symbols.xml b/java/res/xml-sw600dp/key_f1.xml
index 66254dea0..e477d3758 100644
--- a/java/res/xml-sw600dp/kbd_spanish_symbols.xml
+++ b/java/res/xml-sw600dp/key_f1.xml
@@ -18,9 +18,28 @@
*/
-->
-<Keyboard
+<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
- <include
- latin:keyboardLayout="@xml/rows_10_10_7_symbols" />
-</Keyboard>
+ <switch>
+ <case
+ latin:mode="email"
+ >
+ <Key
+ latin:keyStyle="comKeyStyle" />
+ </case>
+ <case
+ latin:mode="url"
+ >
+ <Key
+ latin:keyStyle="comKeyStyle" />
+ </case>
+ <default>
+ <Key
+ latin:keyLabel="/"
+ latin:keyHintLabel="\@"
+ latin:moreKeys="\@"
+ latin:keyStyle="hasShiftedLetterHintStyle" />
+ </default>
+ </switch>
+</merge>
diff --git a/java/res/xml-sw600dp/kbd_hebrew_symbols_shift.xml b/java/res/xml-sw600dp/key_space.xml
index 3c5ed5e09..41f0dbd9b 100644
--- a/java/res/xml-sw600dp/kbd_hebrew_symbols_shift.xml
+++ b/java/res/xml-sw600dp/key_space.xml
@@ -18,9 +18,25 @@
*/
-->
-<Keyboard
+<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
- <include
- latin:keyboardLayout="@xml/rows_10_10_7_symbols_shift" />
-</Keyboard>
+ <switch>
+ <case
+ latin:languageCode="fa"
+ >
+ <Key
+ latin:keyStyle="spaceKeyStyle"
+ latin:keyXPos="30.750%p"
+ latin:keyWidth="30.850%p" />
+ <Key
+ latin:keyStyle="zwnjKeyStyle" />
+ </case>
+ <default>
+ <Key
+ latin:keyStyle="spaceKeyStyle"
+ latin:keyXPos="30.750%p"
+ latin:keyWidth="39.750%p" />
+ </default>
+ </switch>
+</merge>
diff --git a/java/res/xml-sw600dp/row_qwerty4.xml b/java/res/xml-sw600dp/row_qwerty4.xml
index eec35b078..95b328b38 100644
--- a/java/res/xml-sw600dp/row_qwerty4.xml
+++ b/java/res/xml-sw600dp/row_qwerty4.xml
@@ -29,45 +29,10 @@
latin:keyWidth="13.0%p" />
<Key
latin:keyStyle="tabKeyStyle" />
- <switch>
- <case
- latin:mode="email"
- >
- <Key
- latin:keyStyle="comKeyStyle" />
- </case>
- <case
- latin:mode="url"
- >
- <Key
- latin:keyStyle="comKeyStyle" />
- </case>
- <default>
- <Key
- latin:keyLabel="/"
- latin:keyHintLabel="\@"
- latin:moreKeys="\@"
- latin:keyStyle="hasShiftedLetterHintStyle" />
- </default>
- </switch>
- <switch>
- <case
- latin:languageCode="fa"
- >
- <Key
- latin:keyStyle="spaceKeyStyle"
- latin:keyXPos="30.750%p"
- latin:keyWidth="30.850%p" />
- <Key
- latin:keyStyle="zwnjKeyStyle" />
- </case>
- <default>
- <Key
- latin:keyStyle="spaceKeyStyle"
- latin:keyXPos="30.750%p"
- latin:keyWidth="39.750%p" />
- </default>
- </switch>
+ <include
+ latin:keyboardLayout="@xml/key_f1" />
+ <include
+ latin:keyboardLayout="@xml/key_space" />
<switch>
<case
latin:languageCode="iw"
@@ -78,7 +43,9 @@
<!-- not languageCode="iw" -->
<default>
<include
- latin:keyboardLayout="@xml/keys_apostrophe_dash" />
+ latin:keyboardLayout="@xml/key_apostrophe" />
+ <include
+ latin:keyboardLayout="@xml/key_dash" />
</default>
</switch>
<Spacer
diff --git a/java/res/xml-sw600dp/rows_symbols4.xml b/java/res/xml-sw600dp/row_symbols4.xml
index baa090c24..baa090c24 100644
--- a/java/res/xml-sw600dp/rows_symbols4.xml
+++ b/java/res/xml-sw600dp/row_symbols4.xml
diff --git a/java/res/xml-sw600dp/rows_symbols_shift4.xml b/java/res/xml-sw600dp/row_symbols_shift4.xml
index 4381bce6d..4381bce6d 100644
--- a/java/res/xml-sw600dp/rows_symbols_shift4.xml
+++ b/java/res/xml-sw600dp/row_symbols_shift4.xml
diff --git a/java/res/xml-sw600dp/rows_10_10_7_symbols.xml b/java/res/xml-sw600dp/rows_10_10_7_symbols.xml
index bdb1aa0ee..fe9f2fb5f 100644
--- a/java/res/xml-sw600dp/rows_10_10_7_symbols.xml
+++ b/java/res/xml-sw600dp/rows_10_10_7_symbols.xml
@@ -58,5 +58,5 @@
latin:keyWidth="fillRight" />
</Row>
<include
- latin:keyboardLayout="@xml/rows_symbols4" />
+ latin:keyboardLayout="@xml/row_symbols4" />
</merge>
diff --git a/java/res/xml-sw600dp/rows_10_10_7_symbols_shift.xml b/java/res/xml-sw600dp/rows_10_10_7_symbols_shift.xml
index 101493423..9df112153 100644
--- a/java/res/xml-sw600dp/rows_10_10_7_symbols_shift.xml
+++ b/java/res/xml-sw600dp/rows_10_10_7_symbols_shift.xml
@@ -54,5 +54,5 @@
latin:keyboardLayout="@xml/rowkeys_symbols_shift3" />
</Row>
<include
- latin:keyboardLayout="@xml/rows_symbols_shift4" />
+ latin:keyboardLayout="@xml/row_symbols_shift4" />
</merge>
diff --git a/java/res/xml-sw600dp/rows_hebrew.xml b/java/res/xml-sw600dp/rows_hebrew.xml
index a60da3a2b..d6861e8e4 100644
--- a/java/res/xml-sw600dp/rows_hebrew.xml
+++ b/java/res/xml-sw600dp/rows_hebrew.xml
@@ -27,7 +27,9 @@
latin:keyWidth="8.5%p"
>
<include
- latin:keyboardLayout="@xml/keys_apostrophe_dash" />
+ latin:keyboardLayout="@xml/key_apostrophe" />
+ <include
+ latin:keyboardLayout="@xml/key_dash" />
<include
latin:keyboardLayout="@xml/rowkeys_hebrew1" />
<Key
diff --git a/java/res/xml-sw600dp/rows_symbols.xml b/java/res/xml-sw600dp/rows_symbols.xml
index ea9b30245..ada22dff6 100644
--- a/java/res/xml-sw600dp/rows_symbols.xml
+++ b/java/res/xml-sw600dp/rows_symbols.xml
@@ -58,5 +58,5 @@
latin:keyWidth="fillRight" />
</Row>
<include
- latin:keyboardLayout="@xml/rows_symbols4" />
+ latin:keyboardLayout="@xml/row_symbols4" />
</merge>
diff --git a/java/res/xml-sw600dp/rows_symbols_shift.xml b/java/res/xml-sw600dp/rows_symbols_shift.xml
index cc66f9676..0750670d6 100644
--- a/java/res/xml-sw600dp/rows_symbols_shift.xml
+++ b/java/res/xml-sw600dp/rows_symbols_shift.xml
@@ -54,5 +54,5 @@
latin:keyboardLayout="@xml/rowkeys_symbols_shift3" />
</Row>
<include
- latin:keyboardLayout="@xml/rows_symbols_shift4" />
+ latin:keyboardLayout="@xml/row_symbols_shift4" />
</merge>