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

* commit 'd16c838d6e2d17f711513c9fb77e0a396e91c74f':
  Remove tab key from alphabet layout of tablet 7
main
Tadashi G. Takaoka 2012-05-01 03:32:22 -07:00 committed by Android Git Automerger
commit c9ebb92070
27 changed files with 58 additions and 66 deletions

View File

@ -35,7 +35,8 @@
<fraction name="key_bottom_gap_gb">5.200%p</fraction> <fraction name="key_bottom_gap_gb">5.200%p</fraction>
<fraction name="key_horizontal_gap_gb">1.447%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> <fraction name="keyboard_bottom_padding_ics">0.0%p</fraction>
<dimen name="popup_key_height">81.9dp</dimen> <dimen name="popup_key_height">81.9dp</dimen>

View File

@ -38,7 +38,8 @@
<fraction name="key_bottom_gap_gb">4.625%p</fraction> <fraction name="key_bottom_gap_gb">4.625%p</fraction>
<fraction name="key_horizontal_gap_gb">2.113%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> <fraction name="keyboard_bottom_padding_ics">4.0%p</fraction>
<dimen name="more_keys_keyboard_key_horizontal_padding">6dp</dimen> <dimen name="more_keys_keyboard_key_horizontal_padding">6dp</dimen>

View File

@ -27,8 +27,8 @@
<Key <Key
latin:keyStyle="toSymbolKeyStyle" latin:keyStyle="toSymbolKeyStyle"
latin:keyWidth="13.0%p" /> latin:keyWidth="13.0%p" />
<Key <include
latin:keyStyle="tabKeyStyle" /> latin:keyboardLayout="@xml/key_smiley" />
<include <include
latin:keyboardLayout="@xml/key_f1" /> latin:keyboardLayout="@xml/key_f1" />
<include <include

View File

@ -27,8 +27,8 @@
<Key <Key
latin:keyStyle="toSymbolKeyStyle" latin:keyStyle="toSymbolKeyStyle"
latin:keyWidth="13.0%p" /> latin:keyWidth="13.0%p" />
<Key <include
latin:keyStyle="tabKeyStyle" /> latin:keyboardLayout="@xml/key_smiley" />
<include <include
latin:keyboardLayout="@xml/key_f1" /> latin:keyboardLayout="@xml/key_f1" />
<include <include

View File

@ -41,9 +41,9 @@
latin:keyWidth="10.5%p" /> latin:keyWidth="10.5%p" />
</case> </case>
<default> <default>
<Spacer <include
latin:keyXPos="15.0%p" latin:keyboardLayout="@xml/key_smiley"
latin:keyWidth="10.5%p" /> latin:keyXPos="18.5%p" />
</default> </default>
</switch> </switch>
<switch> <switch>

View File

@ -27,8 +27,8 @@
<Key <Key
latin:keyStyle="toSymbolKeyStyle" latin:keyStyle="toSymbolKeyStyle"
latin:keyWidth="13.0%p" /> latin:keyWidth="13.0%p" />
<Key <include
latin:keyStyle="tabKeyStyle" /> latin:keyboardLayout="@xml/key_smiley" />
<include <include
latin:keyboardLayout="@xml/key_f1" /> latin:keyboardLayout="@xml/key_f1" />
<include <include

View File

@ -28,7 +28,7 @@
latin:keyStyle="toAlphaKeyStyle" latin:keyStyle="toAlphaKeyStyle"
latin:keyWidth="13.0%p" /> latin:keyWidth="13.0%p" />
<Key <Key
latin:keyStyle="tabKeyStyle" /> latin:keyStyle="smileyKeyStyle" />
<Key <Key
latin:keyLabel="\@" /> latin:keyLabel="\@" />
<include <include

View File

@ -28,7 +28,7 @@
latin:keyStyle="toAlphaKeyStyle" latin:keyStyle="toAlphaKeyStyle"
latin:keyWidth="13.0%p" /> latin:keyWidth="13.0%p" />
<Key <Key
latin:keyStyle="tabKeyStyle" /> latin:keyStyle="smileyKeyStyle" />
<include <include
latin:keyXPos="30.750%p" latin:keyXPos="30.750%p"
latin:keyboardLayout="@xml/key_space" /> latin:keyboardLayout="@xml/key_space" />

View File

@ -46,10 +46,8 @@
latin:keyWidth="7.6%p" latin:keyWidth="7.6%p"
> >
<include <include
latin:keyboardLayout="@xml/key_smiley" latin:keyboardLayout="@xml/rowkeys_arabic3"
latin:keyWidth="10.0%p" /> latin:keyXPos="10.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_arabic3" />
</Row> </Row>
<include <include
latin:keyboardLayout="@xml/row_qwerty4" /> latin:keyboardLayout="@xml/row_qwerty4" />

View File

@ -53,9 +53,9 @@
latin:keyboardLayout="@xml/rowkeys_azerty3" /> latin:keyboardLayout="@xml/rowkeys_azerty3" />
<include <include
latin:keyboardLayout="@xml/keys_comma_period" /> latin:keyboardLayout="@xml/keys_comma_period" />
<include <Key
latin:keyboardLayout="@xml/key_smiley" latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-8.5%p" latin:keyXPos="-10.0%p"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<include <include

View File

@ -53,9 +53,9 @@
latin:keyboardLayout="@xml/rowkeys_bulgarian3" /> latin:keyboardLayout="@xml/rowkeys_bulgarian3" />
<include <include
latin:keyboardLayout="@xml/keys_comma_period" /> latin:keyboardLayout="@xml/keys_comma_period" />
<include <Key
latin:keyboardLayout="@xml/key_smiley" latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-9.0%p" latin:keyXPos="-10.0%p"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<include <include

View File

@ -55,9 +55,9 @@
latin:keyboardLayout="@xml/rowkeys_colemak3" /> latin:keyboardLayout="@xml/rowkeys_colemak3" />
<include <include
latin:keyboardLayout="@xml/keys_comma_period" /> latin:keyboardLayout="@xml/keys_comma_period" />
<include <Key
latin:keyboardLayout="@xml/key_smiley" latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-8.5%p" latin:keyXPos="-10.0%p"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<include <include

View File

@ -53,9 +53,9 @@
latin:keyWidth="10.0%p" /> latin:keyWidth="10.0%p" />
<include <include
latin:keyboardLayout="@xml/rowkeys_dvorak3" /> latin:keyboardLayout="@xml/rowkeys_dvorak3" />
<include <Key
latin:keyboardLayout="@xml/key_smiley" latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-8.5%p" latin:keyXPos="-10.0%p"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<include <include

View File

@ -56,8 +56,8 @@
latin:keyboardLayout="@xml/rowkeys_east_slavic3" /> latin:keyboardLayout="@xml/rowkeys_east_slavic3" />
<include <include
latin:keyboardLayout="@xml/keys_comma_period" /> latin:keyboardLayout="@xml/keys_comma_period" />
<include <Key
latin:keyboardLayout="@xml/key_smiley" latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-9.0%p" latin:keyXPos="-9.0%p"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>

View File

@ -52,9 +52,9 @@
latin:keyboardLayout="@xml/rowkeys_farsi3" /> latin:keyboardLayout="@xml/rowkeys_farsi3" />
<include <include
latin:keyboardLayout="@xml/keys_comma_period" /> latin:keyboardLayout="@xml/keys_comma_period" />
<include <Key
latin:keyboardLayout="@xml/key_smiley" latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-9.0%p" latin:keyXPos="-10.0%p"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<include <include

View File

@ -53,8 +53,8 @@
latin:keyboardLayout="@xml/rowkeys_georgian3" /> latin:keyboardLayout="@xml/rowkeys_georgian3" />
<include <include
latin:keyboardLayout="@xml/keys_comma_period" /> latin:keyboardLayout="@xml/keys_comma_period" />
<include <Key
latin:keyboardLayout="@xml/key_smiley" latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-9.0%p" latin:keyXPos="-9.0%p"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>

View File

@ -55,8 +55,8 @@
latin:keyboardLayout="@xml/rowkeys_greek3" /> latin:keyboardLayout="@xml/rowkeys_greek3" />
<include <include
latin:keyboardLayout="@xml/keys_comma_period" /> latin:keyboardLayout="@xml/keys_comma_period" />
<include <Key
latin:keyboardLayout="@xml/key_smiley" latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-9.0%p" latin:keyXPos="-9.0%p"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>

View File

@ -52,10 +52,6 @@
<include <include
latin:keyboardLayout="@xml/rowkeys_hebrew3" latin:keyboardLayout="@xml/rowkeys_hebrew3"
latin:keyXPos="10.0%p" /> latin:keyXPos="10.0%p" />
<include
latin:keyboardLayout="@xml/key_smiley"
latin:keyXPos="-8.5%p"
latin:keyWidth="fillRight" />
</Row> </Row>
<include <include
latin:keyboardLayout="@xml/row_hebrew4" /> latin:keyboardLayout="@xml/row_hebrew4" />

View File

@ -53,8 +53,8 @@
latin:keyboardLayout="@xml/rowkeys_hindi3" /> latin:keyboardLayout="@xml/rowkeys_hindi3" />
<include <include
latin:keyboardLayout="@xml/keys_comma_period" /> latin:keyboardLayout="@xml/keys_comma_period" />
<include <Key
latin:keyboardLayout="@xml/key_smiley" latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-7.5%p" latin:keyXPos="-7.5%p"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>

View File

@ -53,9 +53,9 @@
latin:keyboardLayout="@xml/rowkeys_qwerty3" /> latin:keyboardLayout="@xml/rowkeys_qwerty3" />
<include <include
latin:keyboardLayout="@xml/keys_comma_period" /> latin:keyboardLayout="@xml/keys_comma_period" />
<include <Key
latin:keyboardLayout="@xml/key_smiley" latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-7.6%p" latin:keyXPos="-10.0%p"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<include <include

View File

@ -62,9 +62,9 @@
latin:keyWidth="15.0%p" /> latin:keyWidth="15.0%p" />
<include <include
latin:keyboardLayout="@xml/rowkeys_pcqwerty4" /> latin:keyboardLayout="@xml/rowkeys_pcqwerty4" />
<include <Key
latin:keyboardLayout="@xml/key_smiley" latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-9.0%p" latin:keyXPos="-15.0%p"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<include <include

View File

@ -61,10 +61,6 @@
<include <include
latin:keyboardLayout="@xml/rowkeys_pcqwerty4" latin:keyboardLayout="@xml/rowkeys_pcqwerty4"
latin:keyXPos="15.0%p" /> latin:keyXPos="15.0%p" />
<include
latin:keyboardLayout="@xml/key_smiley"
latin:keyXPos="-9.0%p"
latin:keyWidth="fillRight" />
</Row> </Row>
<include <include
latin:keyboardLayout="@xml/row_pcqwerty5" /> latin:keyboardLayout="@xml/row_pcqwerty5" />

View File

@ -53,8 +53,8 @@
latin:keyboardLayout="@xml/rowkeys_qwerty3" /> latin:keyboardLayout="@xml/rowkeys_qwerty3" />
<include <include
latin:keyboardLayout="@xml/keys_comma_period" /> latin:keyboardLayout="@xml/keys_comma_period" />
<include <Key
latin:keyboardLayout="@xml/key_smiley" latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-9.0%p" latin:keyXPos="-9.0%p"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>

View File

@ -53,8 +53,8 @@
latin:keyboardLayout="@xml/rowkeys_qwertz3" /> latin:keyboardLayout="@xml/rowkeys_qwertz3" />
<include <include
latin:keyboardLayout="@xml/keys_comma_period" /> latin:keyboardLayout="@xml/keys_comma_period" />
<include <Key
latin:keyboardLayout="@xml/key_smiley" latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-9.0%p" latin:keyXPos="-9.0%p"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>

View File

@ -53,8 +53,8 @@
latin:keyboardLayout="@xml/rowkeys_south_slavic3" /> latin:keyboardLayout="@xml/rowkeys_south_slavic3" />
<include <include
latin:keyboardLayout="@xml/keys_comma_period" /> latin:keyboardLayout="@xml/keys_comma_period" />
<include <Key
latin:keyboardLayout="@xml/key_smiley" latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-9.0%p" latin:keyXPos="-9.0%p"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>

View File

@ -53,9 +53,9 @@
latin:keyboardLayout="@xml/rowkeys_qwerty3" /> latin:keyboardLayout="@xml/rowkeys_qwerty3" />
<include <include
latin:keyboardLayout="@xml/keys_comma_period" /> latin:keyboardLayout="@xml/keys_comma_period" />
<include <Key
latin:keyboardLayout="@xml/key_smiley" latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-8.5%p" latin:keyXPos="-10.0%p"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<include <include

View File

@ -57,9 +57,9 @@
latin:keyWidth="10.0%p" /> latin:keyWidth="10.0%p" />
<include <include
latin:keyboardLayout="@xml/rowkeys_thai4" /> latin:keyboardLayout="@xml/rowkeys_thai4" />
<include <Key
latin:keyboardLayout="@xml/key_smiley" latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-9.0%p" latin:keyXPos="-10.0%p"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<include <include