am 268a442d: Microphone key on 7-inch tablet on the far right vs where it is on phones

* commit '268a442dc4b68faa6ab9355ea634bd76892a4642':
  Microphone key on 7-inch tablet on the far right vs where it is on phones
main
Tadashi G. Takaoka 2012-06-06 10:43:45 -07:00 committed by Android Git Automerger
commit 960dce0579
13 changed files with 186 additions and 149 deletions

View File

@ -23,20 +23,11 @@
> >
<switch> <switch>
<case <case
latin:mode="email" latin:mode="email|url"
> >
<Key <Key
latin:keyLabel="-" /> latin:keyLabel="-" />
</case> </case>
<case
latin:mode="url"
>
<Key
latin:keyLabel="/"
latin:keyHintLabel=":"
latin:moreKeys=":"
latin:keyStyle="hasShiftedLetterHintStyle" />
</case>
<default> <default>
<Key <Key
latin:keyLabel="!text/keylabel_for_apostrophe" latin:keyLabel="!text/keylabel_for_apostrophe"

View File

@ -23,7 +23,7 @@
> >
<switch> <switch>
<case <case
latin:mode="email" latin:mode="email|url"
> >
<Key <Key
latin:keyLabel="_" /> latin:keyLabel="_" />

View File

@ -0,0 +1,62 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2012, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<switch>
<case
latin:keyboardLayoutSetElement="symbols"
latin:mode="url"
>
<Key
latin:keyLabel=":" />
</case>
<case
latin:keyboardLayoutSetElement="symbols"
>
<Key
latin:keyLabel="\@" />
</case>
<!-- keyboardLayoutSetElement != "symbols" -->
<case
latin:mode="email"
>
<Key
latin:keyLabel="\@" />
</case>
<case
latin:mode="url"
>
<Key
latin:keyLabel="/"
latin:keyHintLabel=":"
latin:moreKeys=":"
latin:keyStyle="hasShiftedLetterHintStyle" />
</case>
<default>
<Key
latin:keyLabel="/"
latin:keyHintLabel="\@"
latin:moreKeys="\@"
latin:keyStyle="hasShiftedLetterHintStyle" />
</default>
</switch>
</merge>

View File

@ -0,0 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2012, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<switch>
<case
latin:mode="email|url"
>
<Key
latin:keyStyle="comKeyStyle" />
</case>
<case
latin:imeAction="actionSearch"
>
<Key
latin:keyLabel=":"
latin:keyHintLabel="+"
latin:moreKeys="+"
latin:keyStyle="hasShiftedLetterHintStyle" />
</case>
<default>
<Key
latin:keyStyle="smileyKeyStyle" />
</default>
</switch>
</merge>

View File

@ -23,20 +23,11 @@
> >
<switch> <switch>
<case <case
latin:mode="email" latin:mode="email|url"
> >
<Key <Key
latin:keyLabel="-" /> latin:keyLabel="-" />
</case> </case>
<case
latin:mode="url"
>
<Key
latin:keyLabel="/"
latin:keyHintLabel=":"
latin:moreKeys=":"
latin:keyStyle="hasShiftedLetterHintStyle" />
</case>
<default> <default>
<Key <Key
latin:keyLabel="\?" latin:keyLabel="\?"

View File

@ -1,71 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2012, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<switch>
<case
latin:mode="url"
>
<Key
latin:keyStyle="comKeyStyle"
latin:keyWidth="18.0%p" />
</case>
<default>
<switch>
<case
latin:mode="email"
>
<Key
latin:keyStyle="comKeyStyle" />
</case>
<case
latin:imeAction="actionSearch"
>
<Key
latin:keyLabel=":"
latin:keyHintLabel="+"
latin:moreKeys="+"
latin:keyStyle="hasShiftedLetterHintStyle" />
</case>
<default>
<Key
latin:keyStyle="smileyKeyStyle" />
</default>
</switch>
<switch>
<case
latin:mode="email"
>
<Key
latin:keyLabel="\@" />
</case>
<default>
<Key
latin:keyLabel="/"
latin:keyHintLabel="\@"
latin:moreKeys="\@"
latin:keyStyle="hasShiftedLetterHintStyle" />
</default>
</switch>
</default>
</switch>
</merge>

View File

@ -23,22 +23,24 @@
> >
<Row <Row
latin:keyWidth="9.0%p" latin:keyWidth="9.0%p"
backgroundType="functional"
> >
<Key <Key
latin:keyStyle="toSymbolKeyStyle" latin:keyStyle="toSymbolKeyStyle"
latin:keyWidth="10.0%p" /> latin:keyWidth="10.0%p" />
<include <include
latin:keyboardLayout="@xml/keys_f1f2" /> latin:keyboardLayout="@xml/key_shortcut" />
<include
latin:keyboardLayout="@xml/key_f1" />
<include <include
latin:keyXPos="28.0%p" latin:keyXPos="28.0%p"
latin:keyboardLayout="@xml/key_space" /> latin:keyboardLayout="@xml/key_space"
latin:backgroundType="normal" />
<include <include
latin:keyboardLayout="@xml/key_question_exclamation" /> latin:keyboardLayout="@xml/key_question_exclamation" />
<include <include
latin:keyboardLayout="@xml/key_dash" /> latin:keyboardLayout="@xml/key_dash" />
<include <include
latin:keyXPos="-9.0%p" latin:keyboardLayout="@xml/key_f2" />
latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" />
</Row> </Row>
</merge> </merge>

View File

@ -23,20 +23,22 @@
> >
<Row <Row
latin:keyWidth="9.0%p" latin:keyWidth="9.0%p"
latin:backgroundType="functional"
> >
<Key <Key
latin:keyStyle="toSymbolKeyStyle" latin:keyStyle="toSymbolKeyStyle"
latin:keyWidth="10.0%p" /> latin:keyWidth="10.0%p" />
<include <include
latin:keyboardLayout="@xml/keys_f1f2" /> latin:keyboardLayout="@xml/key_shortcut" />
<include
latin:keyboardLayout="@xml/key_f1" />
<include <include
latin:keyXPos="28.0%p" latin:keyXPos="28.0%p"
latin:keyboardLayout="@xml/key_space" /> latin:keyboardLayout="@xml/key_space"
latin:backgroundType="normal" />
<include <include
latin:keyboardLayout="@xml/keys_comma_period" /> latin:keyboardLayout="@xml/keys_comma_period" />
<include <include
latin:keyXPos="-9.0%p" latin:keyboardLayout="@xml/key_f2" />
latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" />
</Row> </Row>
</merge> </merge>

View File

@ -23,22 +23,24 @@
> >
<Row <Row
latin:keyWidth="9.0%p" latin:keyWidth="9.0%p"
latin:backgroundType="functional"
> >
<Key <Key
latin:keyStyle="toSymbolKeyStyle" latin:keyStyle="toSymbolKeyStyle"
latin:keyWidth="10.0%p" /> latin:keyWidth="10.0%p" />
<include <include
latin:keyboardLayout="@xml/keys_f1f2" /> latin:keyboardLayout="@xml/key_shortcut" />
<include
latin:keyboardLayout="@xml/key_f1" />
<include <include
latin:keyXPos="28.0%p" latin:keyXPos="28.0%p"
latin:keyboardLayout="@xml/key_space" /> latin:keyboardLayout="@xml/key_space"
latin:backgroundType="normal" />
<include <include
latin:keyboardLayout="@xml/key_apostrophe" /> latin:keyboardLayout="@xml/key_apostrophe" />
<include <include
latin:keyboardLayout="@xml/key_dash" /> latin:keyboardLayout="@xml/key_dash" />
<include <include
latin:keyXPos="-9.0%p" latin:keyboardLayout="@xml/key_f2" />
latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" />
</Row> </Row>
</merge> </merge>

View File

@ -23,25 +23,24 @@
> >
<Row <Row
latin:keyWidth="9.0%p" latin:keyWidth="9.0%p"
latin:backgroundType="functional"
> >
<Key <Key
latin:keyStyle="toAlphaKeyStyle" latin:keyStyle="toAlphaKeyStyle"
latin:keyWidth="10.0%p" /> latin:keyWidth="10.0%p" />
<Key <Key
latin:keyLabel="/" /> latin:keyLabel="/" />
<Key <include
latin:keyLabel="\@" /> latin:keyboardLayout="@xml/key_f1" />
<include <include
latin:keyXPos="28.0%p" latin:keyXPos="28.0%p"
latin:keyboardLayout="@xml/key_space" /> latin:keyboardLayout="@xml/key_space"
latin:backgroundType="normal" />
<Key <Key
latin:keyLabel="&quot;" latin:keyLabel="&quot;"
latin:moreKeys="!text/more_keys_for_tablet_double_quote" /> latin:moreKeys="!text/more_keys_for_tablet_double_quote" />
<Key <Key
latin:keyLabel="_" /> latin:keyLabel="_" />
<include <!-- Here is empty space. -->
latin:keyXPos="-9.0%p"
latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" />
</Row> </Row>
</merge> </merge>

View File

@ -23,16 +23,16 @@
> >
<Row <Row
latin:keyWidth="9.0%p" latin:keyWidth="9.0%p"
latin:backgroundType="functional"
> >
<Key <Key
latin:keyStyle="toAlphaKeyStyle" latin:keyStyle="toAlphaKeyStyle"
latin:keyWidth="10.0%p" /> latin:keyWidth="10.0%p" />
<!-- Here is empty space. -->
<include <include
latin:keyXPos="28.0%p" latin:keyXPos="28.0%p"
latin:keyboardLayout="@xml/key_space" /> latin:keyboardLayout="@xml/key_space"
<include latin:backgroundType="normal" />
latin:keyXPos="-9.0%p" <!-- Here is empty space. -->
latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" />
</Row> </Row>
</merge> </merge>

View File

@ -25,15 +25,18 @@
<Key <Key
latin:keyLabel="-" latin:keyLabel="-"
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p" /> latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key <Key
latin:keyLabel="+" latin:keyLabel="+"
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p" /> latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key <Key
latin:keyLabel="." latin:keyLabel="."
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p" /> latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key <Key
latin:keyLabel="1" latin:keyLabel="1"
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
@ -52,11 +55,13 @@
<Row> <Row>
<Key <Key
latin:keyStyle="numStarKeyStyle" latin:keyStyle="numStarKeyStyle"
latin:keyWidth="10%p" /> latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key <Key
latin:keyLabel="/" latin:keyLabel="/"
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p" /> latin:keyWidth="10%p"
latin:backgroundType="functional" />
<switch> <switch>
<case <case
latin:mode="time|datetime" latin:mode="time|datetime"
@ -66,13 +71,15 @@
latin:keyLabelFlags="hasPopupHint" latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="!text/more_keys_for_am_pm" latin:moreKeys="!text/more_keys_for_am_pm"
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p" /> latin:keyWidth="10%p"
latin:backgroundType="functional" />
</case> </case>
<default> <default>
<Key <Key
latin:keyLabel="," latin:keyLabel=","
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p" /> latin:keyWidth="10%p"
latin:backgroundType="functional" />
</default> </default>
</switch> </switch>
<Key <Key
@ -94,11 +101,13 @@
<Key <Key
latin:keyLabel="(" latin:keyLabel="("
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p" /> latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key <Key
latin:keyLabel=")" latin:keyLabel=")"
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p" /> latin:keyWidth="10%p"
latin:backgroundType="functional" />
<switch> <switch>
<case <case
latin:mode="time|datetime" latin:mode="time|datetime"
@ -106,13 +115,15 @@
<Key <Key
latin:keyLabel=":" latin:keyLabel=":"
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p" /> latin:keyWidth="10%p"
latin:backgroundType="functional" />
</case> </case>
<default> <default>
<Key <Key
latin:keyLabel="=" latin:keyLabel="="
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p" /> latin:keyWidth="10%p"
latin:backgroundType="functional" />
</default> </default>
</switch> </switch>
<Key <Key
@ -131,7 +142,8 @@
<Row> <Row>
<Key <Key
latin:keyStyle="spaceKeyStyle" latin:keyStyle="spaceKeyStyle"
latin:keyWidth="30%p" /> latin:keyWidth="30%p"
latin:backgroundType="functional" />
<Key <Key
latin:keyStyle="numStarKeyStyle" latin:keyStyle="numStarKeyStyle"
latin:keyXPos="31%p" /> latin:keyXPos="31%p" />
@ -141,9 +153,5 @@
<Key <Key
latin:keyLabel="#" latin:keyLabel="#"
latin:keyStyle="numKeyStyle" /> latin:keyStyle="numKeyStyle" />
<include
latin:keyXPos="-10%p"
latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" />
</Row> </Row>
</merge> </merge>

View File

@ -29,14 +29,17 @@
<Key <Key
latin:keyLabel="-" latin:keyLabel="-"
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p" /> latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key <Key
latin:keyLabel="+" latin:keyLabel="+"
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p" /> latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key <Key
latin:keyStyle="numPauseKeyStyle" latin:keyStyle="numPauseKeyStyle"
latin:keyWidth="10%p" /> latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key <Key
latin:keyStyle="num1KeyStyle" latin:keyStyle="num1KeyStyle"
latin:keyXPos="31%p" /> latin:keyXPos="31%p" />
@ -53,14 +56,17 @@
<Key <Key
latin:keyLabel="," latin:keyLabel=","
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p" /> latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key <Key
latin:keyLabel="." latin:keyLabel="."
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p" /> latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key <Key
latin:keyStyle="numWaitKeyStyle" latin:keyStyle="numWaitKeyStyle"
latin:keyWidth="10%p" /> latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key <Key
latin:keyStyle="num4KeyStyle" latin:keyStyle="num4KeyStyle"
latin:keyXPos="31%p" /> latin:keyXPos="31%p" />
@ -77,15 +83,18 @@
<Key <Key
latin:keyLabel="(" latin:keyLabel="("
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p" /> latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key <Key
latin:keyLabel=")" latin:keyLabel=")"
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p" /> latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key <Key
latin:keyLabel="N" latin:keyLabel="N"
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p" /> latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key <Key
latin:keyStyle="num7KeyStyle" latin:keyStyle="num7KeyStyle"
latin:keyXPos="31%p" /> latin:keyXPos="31%p" />
@ -99,7 +108,8 @@
<Row> <Row>
<Key <Key
latin:keyStyle="spaceKeyStyle" latin:keyStyle="spaceKeyStyle"
latin:keyWidth="30%p" /> latin:keyWidth="30%p"
latin:backgroundType="functional" />
<Key <Key
latin:keyStyle="numStarKeyStyle" latin:keyStyle="numStarKeyStyle"
latin:keyXPos="31%p" /> latin:keyXPos="31%p" />
@ -108,9 +118,5 @@
<Key <Key
latin:keyLabel="#" latin:keyLabel="#"
latin:keyStyle="numKeyStyle" /> latin:keyStyle="numKeyStyle" />
<include
latin:keyXPos="-10%p"
latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" />
</Row> </Row>
</merge> </merge>