Merge "Remove tab key from alphabet layout of tablet 7" into jb-dev

2012-05-01 03:08:24 -07:00 · 2012-05-01 03:08:24 -07:00 · d16c838d6e
commit d16c838d6e
parent d44c196ae4 ad5c0dc8f0
27 changed files with 58 additions and 66 deletions
--- 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>
--- 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>
--- 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
--- 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
--- 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>
--- 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
--- 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
--- 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" />
--- 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" />
--- 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
--- 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
--- 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
--- 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
--- 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>
--- 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
--- 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>
--- 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>
--- 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" />
--- 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>
--- 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
--- 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
--- 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" />
--- 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>
--- 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>
--- 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>
--- 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
--- 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