Remove tab key from alphabet layout of tablet 7
Bug: 6410889
Change-Id: If7269aa2aeb1b6af9f0286f96c48b68309d646c5
diff --git a/java/res/xml-sw600dp/row_dvorak4.xml b/java/res/xml-sw600dp/row_dvorak4.xml
index 14a5fd8..0f6e2dd 100644
--- a/java/res/xml-sw600dp/row_dvorak4.xml
+++ b/java/res/xml-sw600dp/row_dvorak4.xml
@@ -27,8 +27,8 @@
<Key
latin:keyStyle="toSymbolKeyStyle"
latin:keyWidth="13.0%p" />
- <Key
- latin:keyStyle="tabKeyStyle" />
+ <include
+ latin:keyboardLayout="@xml/key_smiley" />
<include
latin:keyboardLayout="@xml/key_f1" />
<include
diff --git a/java/res/xml-sw600dp/row_hebrew4.xml b/java/res/xml-sw600dp/row_hebrew4.xml
index 536b653..1e04614 100644
--- a/java/res/xml-sw600dp/row_hebrew4.xml
+++ b/java/res/xml-sw600dp/row_hebrew4.xml
@@ -27,8 +27,8 @@
<Key
latin:keyStyle="toSymbolKeyStyle"
latin:keyWidth="13.0%p" />
- <Key
- latin:keyStyle="tabKeyStyle" />
+ <include
+ latin:keyboardLayout="@xml/key_smiley" />
<include
latin:keyboardLayout="@xml/key_f1" />
<include
diff --git a/java/res/xml-sw600dp/row_pcqwerty5.xml b/java/res/xml-sw600dp/row_pcqwerty5.xml
index 83bc83e..3283de1 100644
--- a/java/res/xml-sw600dp/row_pcqwerty5.xml
+++ b/java/res/xml-sw600dp/row_pcqwerty5.xml
@@ -41,9 +41,9 @@
latin:keyWidth="10.5%p" />
</case>
<default>
- <Spacer
- latin:keyXPos="15.0%p"
- latin:keyWidth="10.5%p" />
+ <include
+ latin:keyboardLayout="@xml/key_smiley"
+ latin:keyXPos="18.5%p" />
</default>
</switch>
<switch>
diff --git a/java/res/xml-sw600dp/row_qwerty4.xml b/java/res/xml-sw600dp/row_qwerty4.xml
index 76ac3a0..fb43b96 100644
--- a/java/res/xml-sw600dp/row_qwerty4.xml
+++ b/java/res/xml-sw600dp/row_qwerty4.xml
@@ -27,8 +27,8 @@
<Key
latin:keyStyle="toSymbolKeyStyle"
latin:keyWidth="13.0%p" />
- <Key
- latin:keyStyle="tabKeyStyle" />
+ <include
+ latin:keyboardLayout="@xml/key_smiley" />
<include
latin:keyboardLayout="@xml/key_f1" />
<include
diff --git a/java/res/xml-sw600dp/row_symbols4.xml b/java/res/xml-sw600dp/row_symbols4.xml
index d294e20..4c0ad23 100644
--- a/java/res/xml-sw600dp/row_symbols4.xml
+++ b/java/res/xml-sw600dp/row_symbols4.xml
@@ -28,7 +28,7 @@
latin:keyStyle="toAlphaKeyStyle"
latin:keyWidth="13.0%p" />
<Key
- latin:keyStyle="tabKeyStyle" />
+ latin:keyStyle="smileyKeyStyle" />
<Key
latin:keyLabel="\@" />
<include
diff --git a/java/res/xml-sw600dp/row_symbols_shift4.xml b/java/res/xml-sw600dp/row_symbols_shift4.xml
index 3a78c72..23db193 100644
--- a/java/res/xml-sw600dp/row_symbols_shift4.xml
+++ b/java/res/xml-sw600dp/row_symbols_shift4.xml
@@ -28,7 +28,7 @@
latin:keyStyle="toAlphaKeyStyle"
latin:keyWidth="13.0%p" />
<Key
- latin:keyStyle="tabKeyStyle" />
+ latin:keyStyle="smileyKeyStyle" />
<include
latin:keyXPos="30.750%p"
latin:keyboardLayout="@xml/key_space" />
diff --git a/java/res/xml-sw600dp/rows_arabic.xml b/java/res/xml-sw600dp/rows_arabic.xml
index 5522326..c796a50 100644
--- a/java/res/xml-sw600dp/rows_arabic.xml
+++ b/java/res/xml-sw600dp/rows_arabic.xml
@@ -46,10 +46,8 @@
latin:keyWidth="7.6%p"
>
<include
- latin:keyboardLayout="@xml/key_smiley"
- latin:keyWidth="10.0%p" />
- <include
- latin:keyboardLayout="@xml/rowkeys_arabic3" />
+ latin:keyboardLayout="@xml/rowkeys_arabic3"
+ latin:keyXPos="10.0%p" />
</Row>
<include
latin:keyboardLayout="@xml/row_qwerty4" />
diff --git a/java/res/xml-sw600dp/rows_azerty.xml b/java/res/xml-sw600dp/rows_azerty.xml
index 3ec22d3..fbfecb3 100644
--- a/java/res/xml-sw600dp/rows_azerty.xml
+++ b/java/res/xml-sw600dp/rows_azerty.xml
@@ -53,9 +53,9 @@
latin:keyboardLayout="@xml/rowkeys_azerty3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
- <include
- latin:keyboardLayout="@xml/key_smiley"
- latin:keyXPos="-8.5%p"
+ <Key
+ latin:keyStyle="shiftKeyStyle"
+ latin:keyXPos="-10.0%p"
latin:keyWidth="fillRight" />
</Row>
<include
diff --git a/java/res/xml-sw600dp/rows_bulgarian.xml b/java/res/xml-sw600dp/rows_bulgarian.xml
index a3b77cc..8c41f96 100644
--- a/java/res/xml-sw600dp/rows_bulgarian.xml
+++ b/java/res/xml-sw600dp/rows_bulgarian.xml
@@ -53,9 +53,9 @@
latin:keyboardLayout="@xml/rowkeys_bulgarian3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
- <include
- latin:keyboardLayout="@xml/key_smiley"
- latin:keyXPos="-9.0%p"
+ <Key
+ latin:keyStyle="shiftKeyStyle"
+ latin:keyXPos="-10.0%p"
latin:keyWidth="fillRight" />
</Row>
<include
diff --git a/java/res/xml-sw600dp/rows_colemak.xml b/java/res/xml-sw600dp/rows_colemak.xml
index aada5eb..b34957c 100644
--- a/java/res/xml-sw600dp/rows_colemak.xml
+++ b/java/res/xml-sw600dp/rows_colemak.xml
@@ -55,9 +55,9 @@
latin:keyboardLayout="@xml/rowkeys_colemak3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
- <include
- latin:keyboardLayout="@xml/key_smiley"
- latin:keyXPos="-8.5%p"
+ <Key
+ latin:keyStyle="shiftKeyStyle"
+ latin:keyXPos="-10.0%p"
latin:keyWidth="fillRight" />
</Row>
<include
diff --git a/java/res/xml-sw600dp/rows_dvorak.xml b/java/res/xml-sw600dp/rows_dvorak.xml
index aec4a5c..d361c3e 100644
--- a/java/res/xml-sw600dp/rows_dvorak.xml
+++ b/java/res/xml-sw600dp/rows_dvorak.xml
@@ -53,9 +53,9 @@
latin:keyWidth="10.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_dvorak3" />
- <include
- latin:keyboardLayout="@xml/key_smiley"
- latin:keyXPos="-8.5%p"
+ <Key
+ latin:keyStyle="shiftKeyStyle"
+ latin:keyXPos="-10.0%p"
latin:keyWidth="fillRight" />
</Row>
<include
diff --git a/java/res/xml-sw600dp/rows_east_slavic.xml b/java/res/xml-sw600dp/rows_east_slavic.xml
index 26fd7df..3f8e50d 100644
--- a/java/res/xml-sw600dp/rows_east_slavic.xml
+++ b/java/res/xml-sw600dp/rows_east_slavic.xml
@@ -56,8 +56,8 @@
latin:keyboardLayout="@xml/rowkeys_east_slavic3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
- <include
- latin:keyboardLayout="@xml/key_smiley"
+ <Key
+ latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-9.0%p"
latin:keyWidth="fillRight" />
</Row>
diff --git a/java/res/xml-sw600dp/rows_farsi.xml b/java/res/xml-sw600dp/rows_farsi.xml
index 7580042..3b39b0a 100644
--- a/java/res/xml-sw600dp/rows_farsi.xml
+++ b/java/res/xml-sw600dp/rows_farsi.xml
@@ -52,9 +52,9 @@
latin:keyboardLayout="@xml/rowkeys_farsi3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
- <include
- latin:keyboardLayout="@xml/key_smiley"
- latin:keyXPos="-9.0%p"
+ <Key
+ latin:keyStyle="shiftKeyStyle"
+ latin:keyXPos="-10.0%p"
latin:keyWidth="fillRight" />
</Row>
<include
diff --git a/java/res/xml-sw600dp/rows_georgian.xml b/java/res/xml-sw600dp/rows_georgian.xml
index d4c39af4..2e166bd 100644
--- a/java/res/xml-sw600dp/rows_georgian.xml
+++ b/java/res/xml-sw600dp/rows_georgian.xml
@@ -53,8 +53,8 @@
latin:keyboardLayout="@xml/rowkeys_georgian3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
- <include
- latin:keyboardLayout="@xml/key_smiley"
+ <Key
+ latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-9.0%p"
latin:keyWidth="fillRight" />
</Row>
diff --git a/java/res/xml-sw600dp/rows_greek.xml b/java/res/xml-sw600dp/rows_greek.xml
index 8314222..85d5c8a 100644
--- a/java/res/xml-sw600dp/rows_greek.xml
+++ b/java/res/xml-sw600dp/rows_greek.xml
@@ -55,8 +55,8 @@
latin:keyboardLayout="@xml/rowkeys_greek3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
- <include
- latin:keyboardLayout="@xml/key_smiley"
+ <Key
+ latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-9.0%p"
latin:keyWidth="fillRight" />
</Row>
diff --git a/java/res/xml-sw600dp/rows_hebrew.xml b/java/res/xml-sw600dp/rows_hebrew.xml
index 521473f..55ce69a 100644
--- a/java/res/xml-sw600dp/rows_hebrew.xml
+++ b/java/res/xml-sw600dp/rows_hebrew.xml
@@ -52,10 +52,6 @@
<include
latin:keyboardLayout="@xml/rowkeys_hebrew3"
latin:keyXPos="10.0%p" />
- <include
- latin:keyboardLayout="@xml/key_smiley"
- latin:keyXPos="-8.5%p"
- latin:keyWidth="fillRight" />
</Row>
<include
latin:keyboardLayout="@xml/row_hebrew4" />
diff --git a/java/res/xml-sw600dp/rows_hindi.xml b/java/res/xml-sw600dp/rows_hindi.xml
index f46c1de..c26439f 100644
--- a/java/res/xml-sw600dp/rows_hindi.xml
+++ b/java/res/xml-sw600dp/rows_hindi.xml
@@ -53,8 +53,8 @@
latin:keyboardLayout="@xml/rowkeys_hindi3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
- <include
- latin:keyboardLayout="@xml/key_smiley"
+ <Key
+ latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-7.5%p"
latin:keyWidth="fillRight" />
</Row>
diff --git a/java/res/xml-sw600dp/rows_nordic.xml b/java/res/xml-sw600dp/rows_nordic.xml
index 57104fa..4cc10d0 100644
--- a/java/res/xml-sw600dp/rows_nordic.xml
+++ b/java/res/xml-sw600dp/rows_nordic.xml
@@ -53,9 +53,9 @@
latin:keyboardLayout="@xml/rowkeys_qwerty3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
- <include
- latin:keyboardLayout="@xml/key_smiley"
- latin:keyXPos="-7.6%p"
+ <Key
+ latin:keyStyle="shiftKeyStyle"
+ latin:keyXPos="-10.0%p"
latin:keyWidth="fillRight" />
</Row>
<include
diff --git a/java/res/xml-sw600dp/rows_pcqwerty.xml b/java/res/xml-sw600dp/rows_pcqwerty.xml
index ff2f785..0c74114 100644
--- a/java/res/xml-sw600dp/rows_pcqwerty.xml
+++ b/java/res/xml-sw600dp/rows_pcqwerty.xml
@@ -62,9 +62,9 @@
latin:keyWidth="15.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty4" />
- <include
- latin:keyboardLayout="@xml/key_smiley"
- latin:keyXPos="-9.0%p"
+ <Key
+ latin:keyStyle="shiftKeyStyle"
+ latin:keyXPos="-15.0%p"
latin:keyWidth="fillRight" />
</Row>
<include
diff --git a/java/res/xml-sw600dp/rows_pcqwerty_symbols.xml b/java/res/xml-sw600dp/rows_pcqwerty_symbols.xml
index 046bce9..dd8df4e 100644
--- a/java/res/xml-sw600dp/rows_pcqwerty_symbols.xml
+++ b/java/res/xml-sw600dp/rows_pcqwerty_symbols.xml
@@ -61,10 +61,6 @@
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty4"
latin:keyXPos="15.0%p" />
- <include
- latin:keyboardLayout="@xml/key_smiley"
- latin:keyXPos="-9.0%p"
- latin:keyWidth="fillRight" />
</Row>
<include
latin:keyboardLayout="@xml/row_pcqwerty5" />
diff --git a/java/res/xml-sw600dp/rows_qwerty.xml b/java/res/xml-sw600dp/rows_qwerty.xml
index 8e8d5ac..9fc0e12 100644
--- a/java/res/xml-sw600dp/rows_qwerty.xml
+++ b/java/res/xml-sw600dp/rows_qwerty.xml
@@ -53,8 +53,8 @@
latin:keyboardLayout="@xml/rowkeys_qwerty3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
- <include
- latin:keyboardLayout="@xml/key_smiley"
+ <Key
+ latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-9.0%p"
latin:keyWidth="fillRight" />
</Row>
diff --git a/java/res/xml-sw600dp/rows_qwertz.xml b/java/res/xml-sw600dp/rows_qwertz.xml
index d8f5bc6..de86444 100644
--- a/java/res/xml-sw600dp/rows_qwertz.xml
+++ b/java/res/xml-sw600dp/rows_qwertz.xml
@@ -53,8 +53,8 @@
latin:keyboardLayout="@xml/rowkeys_qwertz3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
- <include
- latin:keyboardLayout="@xml/key_smiley"
+ <Key
+ latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-9.0%p"
latin:keyWidth="fillRight" />
</Row>
diff --git a/java/res/xml-sw600dp/rows_south_slavic.xml b/java/res/xml-sw600dp/rows_south_slavic.xml
index 8636cbb..80eea6d 100644
--- a/java/res/xml-sw600dp/rows_south_slavic.xml
+++ b/java/res/xml-sw600dp/rows_south_slavic.xml
@@ -53,8 +53,8 @@
latin:keyboardLayout="@xml/rowkeys_south_slavic3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
- <include
- latin:keyboardLayout="@xml/key_smiley"
+ <Key
+ latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-9.0%p"
latin:keyWidth="fillRight" />
</Row>
diff --git a/java/res/xml-sw600dp/rows_spanish.xml b/java/res/xml-sw600dp/rows_spanish.xml
index 9451e42..6aef1d7 100644
--- a/java/res/xml-sw600dp/rows_spanish.xml
+++ b/java/res/xml-sw600dp/rows_spanish.xml
@@ -53,9 +53,9 @@
latin:keyboardLayout="@xml/rowkeys_qwerty3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
- <include
- latin:keyboardLayout="@xml/key_smiley"
- latin:keyXPos="-8.5%p"
+ <Key
+ latin:keyStyle="shiftKeyStyle"
+ latin:keyXPos="-10.0%p"
latin:keyWidth="fillRight" />
</Row>
<include
diff --git a/java/res/xml-sw600dp/rows_thai.xml b/java/res/xml-sw600dp/rows_thai.xml
index d4eaa10..fea1baf 100644
--- a/java/res/xml-sw600dp/rows_thai.xml
+++ b/java/res/xml-sw600dp/rows_thai.xml
@@ -57,9 +57,9 @@
latin:keyWidth="10.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_thai4" />
- <include
- latin:keyboardLayout="@xml/key_smiley"
- latin:keyXPos="-9.0%p"
+ <Key
+ latin:keyStyle="shiftKeyStyle"
+ latin:keyXPos="-10.0%p"
latin:keyWidth="fillRight" />
</Row>
<include