Fix wrong keyEdgeFlags in xlarge keyboard layouts

Bug: 3040988
Change-Id: Ibcac874a96ed0bf35350b50a5dd862a8d03c8354
This commit is contained in:
Tadashi G. Takaoka 2010-09-28 09:39:19 +09:00
parent 8bfcac4d84
commit b514d3f1f8
3 changed files with 20 additions and 25 deletions

View File

@ -26,6 +26,7 @@
android:keyHeight="@dimen/key_height" android:keyHeight="@dimen/key_height"
> >
<Row> <Row>
<!-- This row is intentionally not marked as a top row -->
<Key <Key
android:codes="@integer/key_tab" android:codes="@integer/key_tab"
android:keyLabel="Tab" android:keyLabel="Tab"
@ -34,8 +35,7 @@
<Key <Key
android:keyLabel="q" android:keyLabel="q"
android:popupKeyboard="@xml/kbd_popup_template" android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_q" android:popupCharacters="@string/alternates_for_q" />
android:keyEdgeFlags="left" />
<Key <Key
android:keyLabel="w" android:keyLabel="w"
android:popupKeyboard="@xml/kbd_popup_template" android:popupKeyboard="@xml/kbd_popup_template"
@ -188,18 +188,17 @@
android:isSticky="true" android:isSticky="true"
android:keyEdgeFlags="right" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row>
android:rowEdgeFlags="bottom" <!-- This row is intentionally not marked as a bottom row -->
>
<Key <Key
android:keyLabel="&lt;" android:keyLabel="("
android:popupKeyboard="@xml/kbd_popup_template" android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="(" android:popupCharacters="&lt;"
android:horizontalGap="16.25%p" /> android:horizontalGap="16.25%p" />
<Key <Key
android:keyLabel="&gt;" android:keyLabel=")"
android:popupKeyboard="@xml/kbd_popup_template" android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters=")" /> android:popupCharacters="&gt;" />
<Key <Key
android:codes="@integer/key_space" android:codes="@integer/key_space"
android:keyIcon="@drawable/sym_keyboard_space" android:keyIcon="@drawable/sym_keyboard_space"

View File

@ -25,9 +25,8 @@
android:verticalGap="0px" android:verticalGap="0px"
android:keyHeight="@dimen/key_height" android:keyHeight="@dimen/key_height"
> >
<Row <Row>
android:rowEdgeFlags="top" <!-- This row is intentionally not marked as a top row -->
>
<Key <Key
android:codes="@integer/key_tab" android:codes="@integer/key_tab"
android:keyLabel="Tab" android:keyLabel="Tab"
@ -66,7 +65,7 @@
<Row> <Row>
<Key <Key
android:codes="@integer/key_symbol" android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key" android:keyLabel="@string/label_alpha_key"
android:keyWidth="8.75%p" android:keyWidth="8.75%p"
android:isModifier="true" android:isModifier="true"
android:keyEdgeFlags="left" /> android:keyEdgeFlags="left" />
@ -136,11 +135,10 @@
android:keyWidth="12.5%p" android:keyWidth="12.5%p"
android:isModifier="true" android:isModifier="true"
android:isSticky="true" android:isSticky="true"
android:keyEdgeFlags="left" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row>
android:rowEdgeFlags="bottom" <!-- This row is intentionally not marked as a bottom row -->
>
<Key <Key
android:keyLabel="&lt;" android:keyLabel="&lt;"
android:horizontalGap="16.25%p" /> android:horizontalGap="16.25%p" />

View File

@ -25,9 +25,8 @@
android:verticalGap="0px" android:verticalGap="0px"
android:keyHeight="@dimen/key_height" android:keyHeight="@dimen/key_height"
> >
<Row <Row>
android:rowEdgeFlags="top" <!-- This row is intentionally not marked as a top row -->
>
<Key <Key
android:codes="@integer/key_tab" android:codes="@integer/key_tab"
android:keyLabel="Tab" android:keyLabel="Tab"
@ -67,7 +66,7 @@
<Row> <Row>
<Key <Key
android:codes="@integer/key_symbol" android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key" android:keyLabel="@string/label_alpha_key"
android:keyWidth="8.75%p" android:keyWidth="8.75%p"
android:isModifier="true" android:isModifier="true"
android:keyEdgeFlags="left" /> android:keyEdgeFlags="left" />
@ -137,11 +136,10 @@
android:keyWidth="12.5%p" android:keyWidth="12.5%p"
android:isModifier="true" android:isModifier="true"
android:isSticky="true" android:isSticky="true"
android:keyEdgeFlags="left" /> android:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row>
android:rowEdgeFlags="bottom" <!-- This row is intentionally not marked as a bottom row -->
>
<Key <Key
android:keyLabel="≤" android:keyLabel="≤"
android:horizontalGap="16.25%p" /> android:horizontalGap="16.25%p" />