From fd7b510b24750f30a7cf01f45cd7bd2cbbcd8dac Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Mon, 12 Mar 2012 10:23:29 +0900
Subject: [PATCH] Breakdown Hebrew keyboard into rows

Change-Id: I25c928a3251424280e2ac4f065126c3019734d20
---
 java/res/xml-sw600dp/rows_hebrew.xml | 103 ++-------------------------
 java/res/xml-sw768dp/rows_hebrew.xml | 101 ++------------------------
 java/res/xml/rowkeys_hebrew1.xml     |  48 +++++++++++++
 java/res/xml/rowkeys_hebrew2.xml     |  60 ++++++++++++++++
 java/res/xml/rowkeys_hebrew3.xml     |  59 +++++++++++++++
 java/res/xml/rows_hebrew.xml         | 103 ++-------------------------
 6 files changed, 186 insertions(+), 288 deletions(-)
 create mode 100644 java/res/xml/rowkeys_hebrew1.xml
 create mode 100644 java/res/xml/rowkeys_hebrew2.xml
 create mode 100644 java/res/xml/rowkeys_hebrew3.xml

diff --git a/java/res/xml-sw600dp/rows_hebrew.xml b/java/res/xml-sw600dp/rows_hebrew.xml
index 82175f7ef..519a041c1 100644
--- a/java/res/xml-sw600dp/rows_hebrew.xml
+++ b/java/res/xml-sw600dp/rows_hebrew.xml
@@ -28,30 +28,8 @@
     >
         <include
             latin:keyboardLayout="@xml/keys_apostrophe_dash" />
-        <!-- U+05E7: "ק" HEBREW LETTER QOF -->
-        <Key
-            latin:keyLabel="&#x05E7;" />
-        <!-- U+05E8: "ר" HEBREW LETTER RESH -->
-        <Key
-            latin:keyLabel="&#x05E8;" />
-        <!-- U+05D0: "א" HEBREW LETTER ALEF -->
-        <Key
-            latin:keyLabel="&#x05D0;" />
-        <!-- U+05D8: "ט" HEBREW LETTER TET -->
-        <Key
-            latin:keyLabel="&#x05D8;" />
-        <!-- U+05D5: "ו" HEBREW LETTER VAV -->
-        <Key
-            latin:keyLabel="&#x05D5;" />
-        <!-- U+05DF: "ן" HEBREW LETTER FINAL NUN -->
-        <Key
-            latin:keyLabel="&#x05DF;" />
-        <!-- U+05DD: "ם" HEBREW LETTER FINAL MEM -->
-        <Key
-            latin:keyLabel="&#x05DD;" />
-        <!-- U+05E4: "פ" HEBREW LETTER PE -->
-        <Key
-            latin:keyLabel="&#x05E4;" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_hebrew1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-12.000%p"
@@ -60,43 +38,9 @@
     <Row
         latin:keyWidth="9.0%p"
     >
-        <!-- U+05E9: "ש" HEBREW LETTER SHIN -->
-        <Key
-            latin:keyLabel="&#x05E9;"
-            latin:keyXPos="4.500%p" />
-        <!-- U+05D3: "ד" HEBREW LETTER DALET -->
-        <Key
-            latin:keyLabel="&#x05D3;" />
-        <!-- U+05D2: "ג" HEBREW LETTER GIMEL
-             U+05D2 U+05F3: "ג׳" HEBREW LETTER GIMEL + HEBREW PUNCTUATION GERESH -->
-        <Key
-            latin:keyLabel="&#x05D2;"
-            latin:moreKeys="&#x05D2;&#x05F3;" />
-        <!-- U+05DB: "כ" HEBREW LETTER KAF -->
-        <Key
-            latin:keyLabel="&#x05DB;" />
-        <!-- U+05E2: "ע" HEBREW LETTER AYIN -->
-        <Key
-            latin:keyLabel="&#x05E2;" />
-        <!-- U+05D9: "י" HEBREW LETTER YOD
-             U+05F2 U+05B7: "ײַ" HEBREW LIGATURE YIDDISH DOUBLE YOD + HEBREW POINT PATAH -->
-        <Key
-            latin:keyLabel="&#x05D9;"
-            latin:moreKeys="&#x05F2;&#x05B7;" />
-        <!-- U+05D7: "ח" HEBREW LETTER HET
-             U+05D7 U+05F3: "ח׳" HEBREW LETTER HET + HEBREW PUNCTUATION GERESH -->
-        <Key
-            latin:keyLabel="&#x05D7;"
-            latin:moreKeys="&#x05D7;&#x05F3;" />
-        <!-- U+05DC: "ל" HEBREW LETTER LAMED -->
-        <Key
-            latin:keyLabel="&#x05DC;" />
-        <!-- U+05DA: "ך" HEBREW LETTER FINAL KAF -->
-        <Key
-            latin:keyLabel="&#x05DA;" />
-        <!-- U+05E3: "ף" HEBREW LETTER FINAL PE -->
-        <Key
-            latin:keyLabel="&#x05E3;" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_hebrew2"
+            latin:keyXPos="4.5%p" />
     </Row>
     <Row
         latin:keyWidth="8.9%p"
@@ -104,41 +48,8 @@
         <include
             latin:keyboardLayout="@xml/key_smiley"
             latin:keyWidth="10.0%p" />
-        <!-- U+05D6: "ז" HEBREW LETTER ZAYIN
-             U+05D6 U+05F3: "ז׳" HEBREW LETTER ZAYIN + HEBREW PUNCTUATION GERESH -->
-        <Key
-            latin:keyLabel="&#x05D6;"
-            latin:moreKeys="&#x05D6;&#x05F3;" />
-        <!-- U+05E1: "ס" HEBREW LETTER SAMEKH -->
-        <Key
-            latin:keyLabel="&#x05E1;" />
-        <!-- U+05D1: "ב" HEBREW LETTER BET -->
-        <Key
-            latin:keyLabel="&#x05D1;" />
-        <!-- U+05D4: "ה" HEBREW LETTER HE -->
-        <Key
-            latin:keyLabel="&#x05D4;" />
-        <!-- U+05E0: "נ" HEBREW LETTER NUN -->
-        <Key
-            latin:keyLabel="&#x05E0;" />
-        <!-- U+05DE: "מ" HEBREW LETTER MEM -->
-        <Key
-            latin:keyLabel="&#x05DE;" />
-        <!-- U+05E6: "צ" HEBREW LETTER TSADI
-             U+05E6 U+05F3: "צ׳" HEBREW LETTER TSADI + HEBREW PUNCTUATION GERESH -->
-        <Key
-            latin:keyLabel="&#x05E6;"
-            latin:moreKeys="&#x05E6;&#x05F3;" />
-        <!-- U+05EA: "ת" HEBREW LETTER TAV
-             U+05EA U+05F3: "ת׳" HEBREW LETTER TAV + HEBREW PUNCTUATION GERESH -->
-        <Key
-            latin:keyLabel="&#x05EA;"
-            latin:moreKeys="&#x05EA;&#x05F3;" />
-        <!-- U+05E5: "ץ" HEBREW LETTER FINAL TSADI
-             U+05E5 U+05F3: "ץ׳" HEBREW LETTER FINAL TSADI + HEBREW PUNCTUATION GERESH -->
-        <Key
-            latin:keyLabel="&#x05E5;"
-            latin:moreKeys="&#x05E5;&#x05F3;" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_hebrew3" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyXPos="-10.400%p"
diff --git a/java/res/xml-sw768dp/rows_hebrew.xml b/java/res/xml-sw768dp/rows_hebrew.xml
index c725ee63e..891872ccc 100644
--- a/java/res/xml-sw768dp/rows_hebrew.xml
+++ b/java/res/xml-sw768dp/rows_hebrew.xml
@@ -32,30 +32,8 @@
             latin:keyWidth="7.969%p" />
         <include
             latin:keyboardLayout="@xml/keys_apostrophe_dash" />
-        <!-- U+05E7: "ק" HEBREW LETTER QOF -->
-        <Key
-            latin:keyLabel="&#x05E7;" />
-        <!-- U+05E8: "ר" HEBREW LETTER RESH -->
-        <Key
-            latin:keyLabel="&#x05E8;" />
-        <!-- U+05D0: "א" HEBREW LETTER ALEF -->
-        <Key
-            latin:keyLabel="&#x05D0;" />
-        <!-- U+05D8: "ט" HEBREW LETTER TET -->
-        <Key
-            latin:keyLabel="&#x05D8;" />
-        <!-- U+05D5: "ו" HEBREW LETTER VAV -->
-        <Key
-            latin:keyLabel="&#x05D5;" />
-        <!-- U+05DF: "ן" HEBREW LETTER FINAL NUN -->
-        <Key
-            latin:keyLabel="&#x05DF;" />
-        <!-- U+05DD: "ם" HEBREW LETTER FINAL MEM -->
-        <Key
-            latin:keyLabel="&#x05DD;" />
-        <!-- U+05E4: "פ" HEBREW LETTER PE -->
-        <Key
-            latin:keyLabel="&#x05E4;" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_hebrew1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-12.000%p"
@@ -68,82 +46,15 @@
             latin:keyStyle="toSymbolKeyStyle"
             latin:keyLabelFlags="alignLeft"
             latin:keyWidth="11.172%p" />
-        <!-- U+05E9: "ש" HEBREW LETTER SHIN -->
-        <Key
-            latin:keyLabel="&#x05E9;" />
-        <!-- U+05D3: "ד" HEBREW LETTER DALET -->
-        <Key
-            latin:keyLabel="&#x05D3;" />
-        <!-- U+05D2: "ג" HEBREW LETTER GIMEL
-             U+05D2 U+05F3: "ג׳" HEBREW LETTER GIMEL + HEBREW PUNCTUATION GERESH -->
-        <Key
-            latin:keyLabel="&#x05D2;"
-            latin:moreKeys="&#x05D2;&#x05F3;" />
-        <!-- U+05DB: "כ" HEBREW LETTER KAF -->
-        <Key
-            latin:keyLabel="&#x05DB;" />
-        <!-- U+05E2: "ע" HEBREW LETTER AYIN -->
-        <Key
-            latin:keyLabel="&#x05E2;" />
-        <!-- U+05D9: "י" HEBREW LETTER YOD
-             U+05F2 U+05B7: "ײַ" HEBREW LIGATURE YIDDISH DOUBLE YOD + HEBREW POINT PATAH -->
-        <Key
-            latin:keyLabel="&#x05D9;"
-            latin:moreKeys="&#x05F2;&#x05B7;" />
-        <!-- U+05D7: "ח" HEBREW LETTER HET
-             U+05D7 U+05F3: "ח׳" HEBREW LETTER HET + HEBREW PUNCTUATION GERESH -->
-        <Key
-            latin:keyLabel="&#x05D7;"
-            latin:moreKeys="&#x05D7;&#x05F3;" />
-        <!-- U+05DC: "ל" HEBREW LETTER LAMED -->
-        <Key
-            latin:keyLabel="&#x05DC;" />
-        <!-- U+05DA: "ך" HEBREW LETTER FINAL KAF -->
-        <Key
-            latin:keyLabel="&#x05DA;" />
-        <!-- U+05E3: "ף" HEBREW LETTER FINAL PE -->
-        <Key
-            latin:keyLabel="&#x05E3;" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_hebrew2" />
     </Row>
     <Row
         latin:keyWidth="8.047%p"
     >
-        <!-- U+05D6: "ז" HEBREW LETTER ZAYIN
-             U+05D6 U+05F3: "ז׳" HEBREW LETTER ZAYIN + HEBREW PUNCTUATION GERESH -->
-        <Key
-            latin:keyLabel="&#x05D6;"
-            latin:moreKeys="&#x05D6;&#x05F3;"
+        <include
+            latin:keyboardLayout="@xml/rowkeys_hebrew3"
             latin:keyXPos="13.829%p" />
-        <!-- U+05E1: "ס" HEBREW LETTER SAMEKH -->
-        <Key
-            latin:keyLabel="&#x05E1;" />
-        <!-- U+05D1: "ב" HEBREW LETTER BET -->
-        <Key
-            latin:keyLabel="&#x05D1;" />
-        <!-- U+05D4: "ה" HEBREW LETTER HE -->
-        <Key
-            latin:keyLabel="&#x05D4;" />
-        <!-- U+05E0: "נ" HEBREW LETTER NUN -->
-        <Key
-            latin:keyLabel="&#x05E0;" />
-        <!-- U+05DE: "מ" HEBREW LETTER MEM -->
-        <Key
-            latin:keyLabel="&#x05DE;" />
-        <!-- U+05E6: "צ" HEBREW LETTER TSADI
-             U+05E6 U+05F3: "צ׳" HEBREW LETTER TSADI + HEBREW PUNCTUATION GERESH -->
-        <Key
-            latin:keyLabel="&#x05E6;"
-            latin:moreKeys="&#x05E6;&#x05F3;" />
-        <!-- U+05EA: "ת" HEBREW LETTER TAV
-             U+05EA U+05F3: "ת׳" HEBREW LETTER TAV + HEBREW PUNCTUATION GERESH -->
-        <Key
-            latin:keyLabel="&#x05EA;"
-            latin:moreKeys="&#x05EA;&#x05F3;" />
-        <!-- U+05E5: "ץ" HEBREW LETTER FINAL TSADI
-             U+05E5 U+05F3: "ץ׳" HEBREW LETTER FINAL TSADI + HEBREW PUNCTUATION GERESH -->
-        <Key
-            latin:keyLabel="&#x05E5;"
-            latin:moreKeys="&#x05E5;&#x05F3;" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyXPos="-10.400%p"
diff --git a/java/res/xml/rowkeys_hebrew1.xml b/java/res/xml/rowkeys_hebrew1.xml
new file mode 100644
index 000000000..396da785e
--- /dev/null
+++ b/java/res/xml/rowkeys_hebrew1.xml
@@ -0,0 +1,48 @@
+<?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"
+>
+    <!-- U+05E7: "ק" HEBREW LETTER QOF -->
+    <Key
+        latin:keyLabel="&#x05E7;" />
+    <!-- U+05E8: "ר" HEBREW LETTER RESH -->
+    <Key
+        latin:keyLabel="&#x05E8;" />
+    <!-- U+05D0: "א" HEBREW LETTER ALEF -->
+    <Key
+        latin:keyLabel="&#x05D0;" />
+    <!-- U+05D8: "ט" HEBREW LETTER TET -->
+    <Key
+        latin:keyLabel="&#x05D8;" />
+    <!-- U+05D5: "ו" HEBREW LETTER VAV -->
+    <Key
+        latin:keyLabel="&#x05D5;" />
+    <!-- U+05DF: "ן" HEBREW LETTER FINAL NUN -->
+    <Key
+        latin:keyLabel="&#x05DF;" />
+    <!-- U+05DD: "ם" HEBREW LETTER FINAL MEM -->
+    <Key
+        latin:keyLabel="&#x05DD;" />
+    <!-- U+05E4: "פ" HEBREW LETTER PE -->
+    <Key
+        latin:keyLabel="&#x05E4;" />
+</merge>
diff --git a/java/res/xml/rowkeys_hebrew2.xml b/java/res/xml/rowkeys_hebrew2.xml
new file mode 100644
index 000000000..e4ecac335
--- /dev/null
+++ b/java/res/xml/rowkeys_hebrew2.xml
@@ -0,0 +1,60 @@
+<?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"
+>
+    <!-- U+05E9: "ש" HEBREW LETTER SHIN -->
+    <Key
+        latin:keyLabel="&#x05E9;" />
+    <!-- U+05D3: "ד" HEBREW LETTER DALET -->
+    <Key
+        latin:keyLabel="&#x05D3;" />
+    <!-- U+05D2: "ג" HEBREW LETTER GIMEL
+         U+05D2 U+05F3: "ג׳" HEBREW LETTER GIMEL + HEBREW PUNCTUATION GERESH -->
+    <Key
+        latin:keyLabel="&#x05D2;"
+        latin:moreKeys="&#x05D2;&#x05F3;" />
+    <!-- U+05DB: "כ" HEBREW LETTER KAF -->
+    <Key
+        latin:keyLabel="&#x05DB;" />
+    <!-- U+05E2: "ע" HEBREW LETTER AYIN -->
+    <Key
+        latin:keyLabel="&#x05E2;" />
+    <!-- U+05D9: "י" HEBREW LETTER YOD
+         U+05F2 U+05B7: "ײַ" HEBREW LIGATURE YIDDISH DOUBLE YOD + HEBREW POINT PATAH -->
+    <Key
+        latin:keyLabel="&#x05D9;"
+        latin:moreKeys="&#x05F2;&#x05B7;" />
+    <!-- U+05D7: "ח" HEBREW LETTER HET
+         U+05D7 U+05F3: "ח׳" HEBREW LETTER HET + HEBREW PUNCTUATION GERESH -->
+    <Key
+        latin:keyLabel="&#x05D7;"
+        latin:moreKeys="&#x05D7;&#x05F3;" />
+    <!-- U+05DC: "ל" HEBREW LETTER LAMED -->
+    <Key
+        latin:keyLabel="&#x05DC;" />
+    <!-- U+05DA: "ך" HEBREW LETTER FINAL KAF -->
+    <Key
+        latin:keyLabel="&#x05DA;" />
+    <!-- U+05E3: "ף" HEBREW LETTER FINAL PE -->
+    <Key
+        latin:keyLabel="&#x05E3;" />
+</merge>
diff --git a/java/res/xml/rowkeys_hebrew3.xml b/java/res/xml/rowkeys_hebrew3.xml
new file mode 100644
index 000000000..805a7a596
--- /dev/null
+++ b/java/res/xml/rowkeys_hebrew3.xml
@@ -0,0 +1,59 @@
+<?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"
+>
+    <!-- U+05D6: "ז" HEBREW LETTER ZAYIN
+         U+05D6 U+05F3: "ז׳" HEBREW LETTER ZAYIN + HEBREW PUNCTUATION GERESH -->
+    <Key
+        latin:keyLabel="&#x05D6;"
+        latin:moreKeys="&#x05D6;&#x05F3;" />
+    <!-- U+05E1: "ס" HEBREW LETTER SAMEKH -->
+    <Key
+        latin:keyLabel="&#x05E1;" />
+    <!-- U+05D1: "ב" HEBREW LETTER BET -->
+    <Key
+        latin:keyLabel="&#x05D1;" />
+    <!-- U+05D4: "ה" HEBREW LETTER HE -->
+    <Key
+        latin:keyLabel="&#x05D4;" />
+    <!-- U+05E0: "נ" HEBREW LETTER NUN -->
+    <Key
+        latin:keyLabel="&#x05E0;" />
+    <!-- U+05DE: "מ" HEBREW LETTER MEM -->
+    <Key
+        latin:keyLabel="&#x05DE;" />
+    <!-- U+05E6: "צ" HEBREW LETTER TSADI
+         U+05E6 U+05F3: "צ׳" HEBREW LETTER TSADI + HEBREW PUNCTUATION GERESH -->
+    <Key
+        latin:keyLabel="&#x05E6;"
+        latin:moreKeys="&#x05E6;&#x05F3;" />
+    <!-- U+05EA: "ת" HEBREW LETTER TAV
+         U+05EA U+05F3: "ת׳" HEBREW LETTER TAV + HEBREW PUNCTUATION GERESH -->
+    <Key
+        latin:keyLabel="&#x05EA;"
+        latin:moreKeys="&#x05EA;&#x05F3;" />
+    <!-- U+05E5: "ץ" HEBREW LETTER FINAL TSADI
+         U+05E5 U+05F3: "ץ׳" HEBREW LETTER FINAL TSADI + HEBREW PUNCTUATION GERESH -->
+    <Key
+        latin:keyLabel="&#x05E5;"
+        latin:moreKeys="&#x05E5;&#x05F3;" />
+</merge>
diff --git a/java/res/xml/rows_hebrew.xml b/java/res/xml/rows_hebrew.xml
index 1f11632f5..2d513df65 100644
--- a/java/res/xml/rows_hebrew.xml
+++ b/java/res/xml/rows_hebrew.xml
@@ -26,31 +26,9 @@
     <Row
         latin:keyWidth="10%p"
     >
-        <!-- U+05E7: "ק" HEBREW LETTER QOF -->
-        <Key
-            latin:keyLabel="&#x05E7;"
+        <include
+            latin:keyboardLayout="@xml/rowkeys_hebrew1"
             latin:keyXPos="5%p" />
-        <!-- U+05E8: "ר" HEBREW LETTER RESH -->
-        <Key
-            latin:keyLabel="&#x05E8;" />
-        <!-- U+05D0: "א" HEBREW LETTER ALEF -->
-        <Key
-            latin:keyLabel="&#x05D0;" />
-        <!-- U+05D8: "ט" HEBREW LETTER TET -->
-        <Key
-            latin:keyLabel="&#x05D8;" />
-        <!-- U+05D5: "ו" HEBREW LETTER VAV -->
-        <Key
-            latin:keyLabel="&#x05D5;" />
-        <!-- U+05DF: "ן" HEBREW LETTER FINAL NUN -->
-        <Key
-            latin:keyLabel="&#x05DF;" />
-        <!-- U+05DD: "ם" HEBREW LETTER FINAL MEM -->
-        <Key
-            latin:keyLabel="&#x05DD;" />
-        <!-- U+05E4: "פ" HEBREW LETTER PE -->
-        <Key
-            latin:keyLabel="&#x05E4;" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight"
@@ -59,84 +37,15 @@
     <Row
         latin:keyWidth="10%p"
     >
-        <!-- U+05E9: "ש" HEBREW LETTER SHIN -->
-        <Key
-            latin:keyLabel="&#x05E9;" />
-        <!-- U+05D3: "ד" HEBREW LETTER DALET -->
-        <Key
-            latin:keyLabel="&#x05D3;" />
-        <!-- U+05D2: "ג" HEBREW LETTER GIMEL
-             U+05D2 U+05F3: "ג׳" HEBREW LETTER GIMEL + HEBREW PUNCTUATION GERESH -->
-        <Key
-            latin:keyLabel="&#x05D2;"
-            latin:moreKeys="&#x05D2;&#x05F3;" />
-        <!-- U+05DB: "כ" HEBREW LETTER KAF -->
-        <Key
-            latin:keyLabel="&#x05DB;" />
-        <!-- U+05E2: "ע" HEBREW LETTER AYIN -->
-        <Key
-            latin:keyLabel="&#x05E2;" />
-        <!-- U+05D9: "י" HEBREW LETTER YOD
-             U+05F2 U+05B7: "ײַ" HEBREW LIGATURE YIDDISH DOUBLE YOD + HEBREW POINT PATAH -->
-        <Key
-            latin:keyLabel="&#x05D9;"
-            latin:moreKeys="&#x05F2;&#x05B7;" />
-        <!-- U+05D7: "ח" HEBREW LETTER HET
-             U+05D7 U+05F3: "ח׳" HEBREW LETTER HET + HEBREW PUNCTUATION GERESH -->
-        <Key
-            latin:keyLabel="&#x05D7;"
-            latin:moreKeys="&#x05D7;&#x05F3;" />
-        <!-- U+05DC: "ל" HEBREW LETTER LAMED -->
-        <Key
-            latin:keyLabel="&#x05DC;" />
-        <!-- U+05DA: "ך" HEBREW LETTER FINAL KAF -->
-        <Key
-            latin:keyLabel="&#x05DA;" />
-        <!-- U+05E3: "ף" HEBREW LETTER FINAL PE -->
-        <Key
-            latin:keyLabel="&#x05E3;"
-            latin:keyWidth="fillRight" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_hebrew2" />
     </Row>
     <Row
         latin:keyWidth="10%p"
     >
-        <!-- U+05D6: "ז" HEBREW LETTER ZAYIN
-             U+05D6 U+05F3: "ז׳" HEBREW LETTER ZAYIN + HEBREW PUNCTUATION GERESH -->
-        <Key
-            latin:keyLabel="&#x05D6;"
-            latin:moreKeys="&#x05D6;&#x05F3;"
+        <include
+            latin:keyboardLayout="@xml/rowkeys_hebrew3"
             latin:keyXPos="5%p" />
-        <!-- U+05E1: "ס" HEBREW LETTER SAMEKH -->
-        <Key
-            latin:keyLabel="&#x05E1;" />
-        <!-- U+05D1: "ב" HEBREW LETTER BET -->
-        <Key
-            latin:keyLabel="&#x05D1;" />
-        <!-- U+05D4: "ה" HEBREW LETTER HE -->
-        <Key
-            latin:keyLabel="&#x05D4;" />
-        <!-- U+05E0: "נ" HEBREW LETTER NUN -->
-        <Key
-            latin:keyLabel="&#x05E0;" />
-        <!-- U+05DE: "מ" HEBREW LETTER MEM -->
-        <Key
-            latin:keyLabel="&#x05DE;" />
-        <!-- U+05E6: "צ" HEBREW LETTER TSADI
-             U+05E6 U+05F3: "צ׳" HEBREW LETTER TSADI + HEBREW PUNCTUATION GERESH -->
-        <Key
-            latin:keyLabel="&#x05E6;"
-            latin:moreKeys="&#x05E6;&#x05F3;" />
-        <!-- U+05EA: "ת" HEBREW LETTER TAV
-             U+05EA U+05F3: "ת׳" HEBREW LETTER TAV + HEBREW PUNCTUATION GERESH -->
-        <Key
-            latin:keyLabel="&#x05EA;"
-            latin:moreKeys="&#x05EA;&#x05F3;" />
-        <!-- U+05E5: "ץ" HEBREW LETTER FINAL TSADI
-             U+05E5 U+05F3: "ץ׳" HEBREW LETTER FINAL TSADI + HEBREW PUNCTUATION GERESH -->
-        <Key
-            latin:keyLabel="&#x05E5;"
-            latin:moreKeys="&#x05E5;&#x05F3;" />
-        <!-- Here is 5%p space -->
     </Row>
     <include
         latin:keyboardLayout="@xml/row_qwerty4" />