From ad5c0dc8f03612b0b2ab4e32014d17e5a1294175 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Tue, 1 May 2012 12:35:17 +0900
Subject: [PATCH] Remove tab key from alphabet layout of tablet 7
Bug: 6410889
Change-Id: If7269aa2aeb1b6af9f0286f96c48b68309d646c5
---
java/res/values-sw600dp-land/dimens.xml | 3 ++-
java/res/values-sw600dp/dimens.xml | 3 ++-
java/res/xml-sw600dp/row_dvorak4.xml | 4 ++--
java/res/xml-sw600dp/row_hebrew4.xml | 4 ++--
java/res/xml-sw600dp/row_pcqwerty5.xml | 6 +++---
java/res/xml-sw600dp/row_qwerty4.xml | 4 ++--
java/res/xml-sw600dp/row_symbols4.xml | 2 +-
java/res/xml-sw600dp/row_symbols_shift4.xml | 2 +-
java/res/xml-sw600dp/rows_arabic.xml | 6 ++----
java/res/xml-sw600dp/rows_azerty.xml | 6 +++---
java/res/xml-sw600dp/rows_bulgarian.xml | 6 +++---
java/res/xml-sw600dp/rows_colemak.xml | 6 +++---
java/res/xml-sw600dp/rows_dvorak.xml | 6 +++---
java/res/xml-sw600dp/rows_east_slavic.xml | 4 ++--
java/res/xml-sw600dp/rows_farsi.xml | 6 +++---
java/res/xml-sw600dp/rows_georgian.xml | 4 ++--
java/res/xml-sw600dp/rows_greek.xml | 4 ++--
java/res/xml-sw600dp/rows_hebrew.xml | 4 ----
java/res/xml-sw600dp/rows_hindi.xml | 4 ++--
java/res/xml-sw600dp/rows_nordic.xml | 6 +++---
java/res/xml-sw600dp/rows_pcqwerty.xml | 6 +++---
java/res/xml-sw600dp/rows_pcqwerty_symbols.xml | 4 ----
java/res/xml-sw600dp/rows_qwerty.xml | 4 ++--
java/res/xml-sw600dp/rows_qwertz.xml | 4 ++--
java/res/xml-sw600dp/rows_south_slavic.xml | 4 ++--
java/res/xml-sw600dp/rows_spanish.xml | 6 +++---
java/res/xml-sw600dp/rows_thai.xml | 6 +++---
27 files changed, 58 insertions(+), 66 deletions(-)
diff --git a/java/res/values-sw600dp-land/dimens.xml b/java/res/values-sw600dp-land/dimens.xml
index 8a59c9b542..cc8443edb3 100644
--- a/java/res/values-sw600dp-land/dimens.xml
+++ b/java/res/values-sw600dp-land/dimens.xml
@@ -35,7 +35,8 @@
<fraction name="key_bottom_gap_gb">5.200%p</fraction>
<fraction name="key_horizontal_gap_gb">1.447%p</fraction>
- <fraction name="key_bottom_gap_ics">4.0%p</fraction>
+ <fraction name="key_bottom_gap_ics">4.5%p</fraction>
+ <fraction name="key_horizontal_gap_ics">1.565%p</fraction>
<fraction name="keyboard_bottom_padding_ics">0.0%p</fraction>
<dimen name="popup_key_height">81.9dp</dimen>
diff --git a/java/res/values-sw600dp/dimens.xml b/java/res/values-sw600dp/dimens.xml
index e254c41413..2129db4c7b 100644
--- a/java/res/values-sw600dp/dimens.xml
+++ b/java/res/values-sw600dp/dimens.xml
@@ -38,7 +38,8 @@
<fraction name="key_bottom_gap_gb">4.625%p</fraction>
<fraction name="key_horizontal_gap_gb">2.113%p</fraction>
- <fraction name="key_bottom_gap_ics">4.0%p</fraction>
+ <fraction name="key_bottom_gap_ics">4.5%p</fraction>
+ <fraction name="key_horizontal_gap_ics">1.565%p</fraction>
<fraction name="keyboard_bottom_padding_ics">4.0%p</fraction>
<dimen name="more_keys_keyboard_key_horizontal_padding">6dp</dimen>
diff --git a/java/res/xml-sw600dp/row_dvorak4.xml b/java/res/xml-sw600dp/row_dvorak4.xml
index 14a5fd81d2..0f6e2dd8e6 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 536b653972..1e04614abe 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 83bc83e695..3283de1782 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 76ac3a0d05..fb43b96fd9 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 d294e20cfc..4c0ad23340 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 3a78c72000..23db193047 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 55223267fb..c796a508e8 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 3ec22d302a..fbfecb3413 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 a3b77cc125..8c41f96346 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 aada5eb7a4..b34957c5bf 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 aec4a5cf5c..d361c3e0ce 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 26fd7dfe10..3f8e50d15d 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 75800420ae..3b39b0af81 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 d4c39af45c..2e166bd627 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 8314222c34..85d5c8a233 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 521473f63c..55ce69aa55 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 f46c1debbf..c26439faa3 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 57104fa7dc..4cc10d031c 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 ff2f785eac..0c74114fd1 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 046bce9094..dd8df4e09b 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 8e8d5acb65..9fc0e12b8c 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 d8f5bc6c79..de86444e51 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 8636cbb24e..80eea6d437 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 9451e42d7b..6aef1d781e 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 d4eaa10bb4..fea1bafd17 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
--
GitLab