diff options
Diffstat (limited to 'java/res/xml-sw600dp')
29 files changed, 124 insertions, 162 deletions
diff --git a/java/res/xml-sw600dp/key_f1.xml b/java/res/xml-sw600dp/key_f1.xml deleted file mode 100644 index faf087558..000000000 --- a/java/res/xml-sw600dp/key_f1.xml +++ /dev/null @@ -1,39 +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="email|url" - > - <Key - latin:keyStyle="comKeyStyle" /> - </case> - <default> - <Key - latin:keyLabel="/" - latin:keyHintLabel="\@" - latin:moreKeys="\@" - latin:keyStyle="hasShiftedLetterHintStyle" /> - </default> - </switch> -</merge> diff --git a/java/res/xml-sw600dp/key_smiley.xml b/java/res/xml-sw600dp/key_smiley.xml deleted file mode 100644 index 3430d7898..000000000 --- a/java/res/xml-sw600dp/key_smiley.xml +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2011, 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" - > - <Key - latin:keyLabel="\@" /> - </case> - <case - latin:mode="url" - > - <Key - latin:keyLabel="-" - latin:keyHintLabel="_" - latin:moreKeys="_" - latin:keyStyle="hasShiftedLetterHintStyle" /> - </case> - <case - latin:imeAction="actionSearch" - > - <Key - latin:keyLabel=":" - latin:keyHintLabel="+" - latin:moreKeys="+" - latin:keyStyle="hasShiftedLetterHintStyle" /> - </case> - <default> - <Key - latin:keyStyle="smileyKeyStyle" /> - </default> - </switch> -</merge> diff --git a/java/res/xml-sw600dp/key_styles_common.xml b/java/res/xml-sw600dp/key_styles_common.xml index 884cea1b6..9f16d1b17 100644 --- a/java/res/xml-sw600dp/key_styles_common.xml +++ b/java/res/xml-sw600dp/key_styles_common.xml @@ -161,7 +161,7 @@ <key-style latin:styleName="comKeyStyle" latin:keyLabel="!text/keylabel_for_popular_domain" - latin:keyLabelFlags="fontNormal|hasPopupHint|preserveCase" + latin:keyLabelFlags="autoXScale|fontNormal|hasPopupHint|preserveCase" latin:keyOutputText="!text/keylabel_for_popular_domain" latin:moreKeys="!text/more_keys_for_popular_domain" /> </merge> diff --git a/java/res/xml-sw600dp/keys_f1f2.xml b/java/res/xml-sw600dp/keys_f1f2.xml new file mode 100644 index 000000000..14b7231c9 --- /dev/null +++ b/java/res/xml-sw600dp/keys_f1f2.xml @@ -0,0 +1,71 @@ +<?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="17.8%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> diff --git a/java/res/xml-sw600dp/row_dvorak4.xml b/java/res/xml-sw600dp/row_dvorak4.xml index 14a5fd81d..63ab8a835 100644 --- a/java/res/xml-sw600dp/row_dvorak4.xml +++ b/java/res/xml-sw600dp/row_dvorak4.xml @@ -27,10 +27,8 @@ <Key latin:keyStyle="toSymbolKeyStyle" latin:keyWidth="13.0%p" /> - <Key - latin:keyStyle="tabKeyStyle" /> <include - latin:keyboardLayout="@xml/key_f1" /> + latin:keyboardLayout="@xml/keys_f1f2" /> <include latin:keyXPos="30.750%p" latin:keyboardLayout="@xml/key_space" /> diff --git a/java/res/xml-sw600dp/row_hebrew4.xml b/java/res/xml-sw600dp/row_hebrew4.xml index 536b65397..3d50c7554 100644 --- a/java/res/xml-sw600dp/row_hebrew4.xml +++ b/java/res/xml-sw600dp/row_hebrew4.xml @@ -27,10 +27,8 @@ <Key latin:keyStyle="toSymbolKeyStyle" latin:keyWidth="13.0%p" /> - <Key - latin:keyStyle="tabKeyStyle" /> <include - latin:keyboardLayout="@xml/key_f1" /> + latin:keyboardLayout="@xml/keys_f1f2" /> <include latin:keyboardLayout="@xml/key_space" /> <include diff --git a/java/res/xml-sw600dp/row_pcqwerty5.xml b/java/res/xml-sw600dp/row_pcqwerty5.xml index 83bc83e69..e9e231a16 100644 --- a/java/res/xml-sw600dp/row_pcqwerty5.xml +++ b/java/res/xml-sw600dp/row_pcqwerty5.xml @@ -33,7 +33,7 @@ latin:keyWidth="10.5%p" /> </case> <case - latin:mode="email|url" + latin:mode="url" > <Key latin:keyStyle="comKeyStyle" @@ -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/keys_f1f2" + 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 76ac3a0d0..a41dc6480 100644 --- a/java/res/xml-sw600dp/row_qwerty4.xml +++ b/java/res/xml-sw600dp/row_qwerty4.xml @@ -27,10 +27,8 @@ <Key latin:keyStyle="toSymbolKeyStyle" latin:keyWidth="13.0%p" /> - <Key - latin:keyStyle="tabKeyStyle" /> <include - latin:keyboardLayout="@xml/key_f1" /> + latin:keyboardLayout="@xml/keys_f1f2" /> <include latin:keyXPos="30.750%p" latin:keyboardLayout="@xml/key_space" /> diff --git a/java/res/xml-sw600dp/row_symbols4.xml b/java/res/xml-sw600dp/row_symbols4.xml index d294e20cf..4c0ad2334 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 3a78c7200..23db19304 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 55223267f..c796a508e 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 3ec22d302..fbfecb341 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 a3b77cc12..8c41f9634 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 aada5eb7a..b34957c5b 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 aec4a5cf5..d361c3e0c 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 26fd7dfe1..3f8e50d15 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 75800420a..3b39b0af8 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 d4c39af45..2e166bd62 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 8314222c3..85d5c8a23 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 521473f63..55ce69aa5 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 f46c1debb..c26439faa 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 57104fa7d..4cc10d031 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 ff2f785ea..0c74114fd 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 046bce909..dd8df4e09 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 8e8d5acb6..9fc0e12b8 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 d8f5bc6c7..de86444e5 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 8636cbb24..80eea6d43 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 9451e42d7..6aef1d781 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 d4eaa10bb..fea1bafd1 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 |