diff options
Diffstat (limited to 'java')
73 files changed, 238 insertions, 247 deletions
diff --git a/java/res/drawable-xlarge-land/btn_keyboard_key_dark_normal_holo.9.png b/java/res/drawable-xlarge-land/btn_keyboard_key_dark_normal_holo.9.png Binary files differindex f7cfdbd84..bc0a03fc1 100644 --- a/java/res/drawable-xlarge-land/btn_keyboard_key_dark_normal_holo.9.png +++ b/java/res/drawable-xlarge-land/btn_keyboard_key_dark_normal_holo.9.png diff --git a/java/res/drawable-xlarge-land/btn_keyboard_key_dark_normal_off_holo.9.png b/java/res/drawable-xlarge-land/btn_keyboard_key_dark_normal_off_holo.9.png Binary files differindex fea6fc946..3f2fc0002 100644 --- a/java/res/drawable-xlarge-land/btn_keyboard_key_dark_normal_off_holo.9.png +++ b/java/res/drawable-xlarge-land/btn_keyboard_key_dark_normal_off_holo.9.png diff --git a/java/res/drawable-xlarge-land/btn_keyboard_key_dark_normal_on_holo.9.png b/java/res/drawable-xlarge-land/btn_keyboard_key_dark_normal_on_holo.9.png Binary files differindex cf2ffaf9a..9e77015ea 100644 --- a/java/res/drawable-xlarge-land/btn_keyboard_key_dark_normal_on_holo.9.png +++ b/java/res/drawable-xlarge-land/btn_keyboard_key_dark_normal_on_holo.9.png diff --git a/java/res/drawable-xlarge-land/btn_keyboard_key_dark_pressed_holo.9.png b/java/res/drawable-xlarge-land/btn_keyboard_key_dark_pressed_holo.9.png Binary files differindex 733944c5a..b3ac506ad 100644 --- a/java/res/drawable-xlarge-land/btn_keyboard_key_dark_pressed_holo.9.png +++ b/java/res/drawable-xlarge-land/btn_keyboard_key_dark_pressed_holo.9.png diff --git a/java/res/drawable-xlarge-land/btn_keyboard_key_dark_pressed_off_holo.9.png b/java/res/drawable-xlarge-land/btn_keyboard_key_dark_pressed_off_holo.9.png Binary files differindex 5c24d66da..66138edec 100644 --- a/java/res/drawable-xlarge-land/btn_keyboard_key_dark_pressed_off_holo.9.png +++ b/java/res/drawable-xlarge-land/btn_keyboard_key_dark_pressed_off_holo.9.png diff --git a/java/res/drawable-xlarge-land/btn_keyboard_key_dark_pressed_on_holo.9.png b/java/res/drawable-xlarge-land/btn_keyboard_key_dark_pressed_on_holo.9.png Binary files differindex d0afa5b0d..7c80300e9 100644 --- a/java/res/drawable-xlarge-land/btn_keyboard_key_dark_pressed_on_holo.9.png +++ b/java/res/drawable-xlarge-land/btn_keyboard_key_dark_pressed_on_holo.9.png diff --git a/java/res/drawable-xlarge-land/btn_keyboard_key_light_normal_holo.9.png b/java/res/drawable-xlarge-land/btn_keyboard_key_light_normal_holo.9.png Binary files differindex a34fe5854..737de397b 100644 --- a/java/res/drawable-xlarge-land/btn_keyboard_key_light_normal_holo.9.png +++ b/java/res/drawable-xlarge-land/btn_keyboard_key_light_normal_holo.9.png diff --git a/java/res/drawable-xlarge-land/btn_keyboard_key_light_pressed_holo.9.png b/java/res/drawable-xlarge-land/btn_keyboard_key_light_pressed_holo.9.png Binary files differindex daa7f6c53..3dcd8323d 100644 --- a/java/res/drawable-xlarge-land/btn_keyboard_key_light_pressed_holo.9.png +++ b/java/res/drawable-xlarge-land/btn_keyboard_key_light_pressed_holo.9.png diff --git a/java/res/drawable-xlarge-land/key_hint_at_holo.9.png b/java/res/drawable-xlarge-land/key_hint_at_holo.9.png Binary files differnew file mode 100644 index 000000000..011b41b5f --- /dev/null +++ b/java/res/drawable-xlarge-land/key_hint_at_holo.9.png diff --git a/java/res/drawable-xlarge-land/key_hint_colon_holo.9.png b/java/res/drawable-xlarge-land/key_hint_colon_holo.9.png Binary files differindex 093f2df4c..6470ed391 100644 --- a/java/res/drawable-xlarge-land/key_hint_colon_holo.9.png +++ b/java/res/drawable-xlarge-land/key_hint_colon_holo.9.png diff --git a/java/res/drawable-xlarge-land/key_hint_comma_holo.9.png b/java/res/drawable-xlarge-land/key_hint_comma_holo.9.png Binary files differindex 0965dc879..f9391623b 100644 --- a/java/res/drawable-xlarge-land/key_hint_comma_holo.9.png +++ b/java/res/drawable-xlarge-land/key_hint_comma_holo.9.png diff --git a/java/res/drawable-xlarge-land/key_hint_dash_holo.9.png b/java/res/drawable-xlarge-land/key_hint_dash_holo.9.png Binary files differindex 1f77c6ed1..1cb0bdfaa 100644 --- a/java/res/drawable-xlarge-land/key_hint_dash_holo.9.png +++ b/java/res/drawable-xlarge-land/key_hint_dash_holo.9.png diff --git a/java/res/drawable-xlarge-land/key_hint_doublecross_holo.9.png b/java/res/drawable-xlarge-land/key_hint_doublecross_holo.9.png Binary files differindex 716b8f15c..7e7ceb3fc 100644 --- a/java/res/drawable-xlarge-land/key_hint_doublecross_holo.9.png +++ b/java/res/drawable-xlarge-land/key_hint_doublecross_holo.9.png diff --git a/java/res/drawable-xlarge-land/key_hint_equal_holo.9.png b/java/res/drawable-xlarge-land/key_hint_equal_holo.9.png Binary files differindex bd42477a9..8e570595c 100644 --- a/java/res/drawable-xlarge-land/key_hint_equal_holo.9.png +++ b/java/res/drawable-xlarge-land/key_hint_equal_holo.9.png diff --git a/java/res/drawable-xlarge-land/key_hint_exclamation_holo.9.png b/java/res/drawable-xlarge-land/key_hint_exclamation_holo.9.png Binary files differindex cb319cfde..badcfb2ec 100644 --- a/java/res/drawable-xlarge-land/key_hint_exclamation_holo.9.png +++ b/java/res/drawable-xlarge-land/key_hint_exclamation_holo.9.png diff --git a/java/res/drawable-xlarge-land/key_hint_larger_holo.9.png b/java/res/drawable-xlarge-land/key_hint_larger_holo.9.png Binary files differindex 4bcae825e..37c05275e 100644 --- a/java/res/drawable-xlarge-land/key_hint_larger_holo.9.png +++ b/java/res/drawable-xlarge-land/key_hint_larger_holo.9.png diff --git a/java/res/drawable-xlarge-land/key_hint_parenclose_holo.9.png b/java/res/drawable-xlarge-land/key_hint_parenclose_holo.9.png Binary files differindex ac9be60b3..97e1f1449 100644 --- a/java/res/drawable-xlarge-land/key_hint_parenclose_holo.9.png +++ b/java/res/drawable-xlarge-land/key_hint_parenclose_holo.9.png diff --git a/java/res/drawable-xlarge-land/key_hint_parenopen_holo.9.png b/java/res/drawable-xlarge-land/key_hint_parenopen_holo.9.png Binary files differindex 635a0c2dc..36add5d51 100644 --- a/java/res/drawable-xlarge-land/key_hint_parenopen_holo.9.png +++ b/java/res/drawable-xlarge-land/key_hint_parenopen_holo.9.png diff --git a/java/res/drawable-xlarge-land/key_hint_period_holo.9.png b/java/res/drawable-xlarge-land/key_hint_period_holo.9.png Binary files differindex 41ac3a80d..4a70f07dc 100644 --- a/java/res/drawable-xlarge-land/key_hint_period_holo.9.png +++ b/java/res/drawable-xlarge-land/key_hint_period_holo.9.png diff --git a/java/res/drawable-xlarge-land/key_hint_plus_holo.9.png b/java/res/drawable-xlarge-land/key_hint_plus_holo.9.png Binary files differindex 89f33671c..7698a5806 100644 --- a/java/res/drawable-xlarge-land/key_hint_plus_holo.9.png +++ b/java/res/drawable-xlarge-land/key_hint_plus_holo.9.png diff --git a/java/res/drawable-xlarge-land/key_hint_question_holo.9.png b/java/res/drawable-xlarge-land/key_hint_question_holo.9.png Binary files differindex 737c8314e..0cfb7120e 100644 --- a/java/res/drawable-xlarge-land/key_hint_question_holo.9.png +++ b/java/res/drawable-xlarge-land/key_hint_question_holo.9.png diff --git a/java/res/drawable-xlarge-land/key_hint_quote_holo.9.png b/java/res/drawable-xlarge-land/key_hint_quote_holo.9.png Binary files differindex 818476559..fbe2296af 100644 --- a/java/res/drawable-xlarge-land/key_hint_quote_holo.9.png +++ b/java/res/drawable-xlarge-land/key_hint_quote_holo.9.png diff --git a/java/res/drawable-xlarge-land/key_hint_semicolon_holo.9.png b/java/res/drawable-xlarge-land/key_hint_semicolon_holo.9.png Binary files differindex d1d8d4fe7..63a3875b5 100644 --- a/java/res/drawable-xlarge-land/key_hint_semicolon_holo.9.png +++ b/java/res/drawable-xlarge-land/key_hint_semicolon_holo.9.png diff --git a/java/res/drawable-xlarge-land/key_hint_simplequote_holo.9.png b/java/res/drawable-xlarge-land/key_hint_simplequote_holo.9.png Binary files differindex 0784b892a..3c217b058 100644 --- a/java/res/drawable-xlarge-land/key_hint_simplequote_holo.9.png +++ b/java/res/drawable-xlarge-land/key_hint_simplequote_holo.9.png diff --git a/java/res/drawable-xlarge-land/key_hint_slash_holo.9.png b/java/res/drawable-xlarge-land/key_hint_slash_holo.9.png Binary files differindex 3df3d9087..98545f0ac 100644 --- a/java/res/drawable-xlarge-land/key_hint_slash_holo.9.png +++ b/java/res/drawable-xlarge-land/key_hint_slash_holo.9.png diff --git a/java/res/drawable-xlarge-land/key_hint_smaller_holo.9.png b/java/res/drawable-xlarge-land/key_hint_smaller_holo.9.png Binary files differindex 8a2852bab..5af183644 100644 --- a/java/res/drawable-xlarge-land/key_hint_smaller_holo.9.png +++ b/java/res/drawable-xlarge-land/key_hint_smaller_holo.9.png diff --git a/java/res/drawable-xlarge-land/key_hint_star_holo.9.png b/java/res/drawable-xlarge-land/key_hint_star_holo.9.png Binary files differindex db7a15a8c..18304d738 100644 --- a/java/res/drawable-xlarge-land/key_hint_star_holo.9.png +++ b/java/res/drawable-xlarge-land/key_hint_star_holo.9.png diff --git a/java/res/drawable-xlarge-land/key_hint_underline_holo.9.png b/java/res/drawable-xlarge-land/key_hint_underline_holo.9.png Binary files differindex 1fa93ee7f..21d548732 100644 --- a/java/res/drawable-xlarge-land/key_hint_underline_holo.9.png +++ b/java/res/drawable-xlarge-land/key_hint_underline_holo.9.png diff --git a/java/res/drawable-xlarge/btn_keyboard_key_dark_normal_holo.9.png b/java/res/drawable-xlarge/btn_keyboard_key_dark_normal_holo.9.png Binary files differindex f7cfdbd84..bc0a03fc1 100644 --- a/java/res/drawable-xlarge/btn_keyboard_key_dark_normal_holo.9.png +++ b/java/res/drawable-xlarge/btn_keyboard_key_dark_normal_holo.9.png diff --git a/java/res/drawable-xlarge/btn_keyboard_key_dark_normal_off_holo.9.png b/java/res/drawable-xlarge/btn_keyboard_key_dark_normal_off_holo.9.png Binary files differindex fea6fc946..3f2fc0002 100644 --- a/java/res/drawable-xlarge/btn_keyboard_key_dark_normal_off_holo.9.png +++ b/java/res/drawable-xlarge/btn_keyboard_key_dark_normal_off_holo.9.png diff --git a/java/res/drawable-xlarge/btn_keyboard_key_dark_normal_on_holo.9.png b/java/res/drawable-xlarge/btn_keyboard_key_dark_normal_on_holo.9.png Binary files differindex cf2ffaf9a..9e77015ea 100644 --- a/java/res/drawable-xlarge/btn_keyboard_key_dark_normal_on_holo.9.png +++ b/java/res/drawable-xlarge/btn_keyboard_key_dark_normal_on_holo.9.png diff --git a/java/res/drawable-xlarge/btn_keyboard_key_dark_pressed_holo.9.png b/java/res/drawable-xlarge/btn_keyboard_key_dark_pressed_holo.9.png Binary files differindex 733944c5a..b3ac506ad 100644 --- a/java/res/drawable-xlarge/btn_keyboard_key_dark_pressed_holo.9.png +++ b/java/res/drawable-xlarge/btn_keyboard_key_dark_pressed_holo.9.png diff --git a/java/res/drawable-xlarge/btn_keyboard_key_dark_pressed_off_holo.9.png b/java/res/drawable-xlarge/btn_keyboard_key_dark_pressed_off_holo.9.png Binary files differindex 5c24d66da..66138edec 100644 --- a/java/res/drawable-xlarge/btn_keyboard_key_dark_pressed_off_holo.9.png +++ b/java/res/drawable-xlarge/btn_keyboard_key_dark_pressed_off_holo.9.png diff --git a/java/res/drawable-xlarge/btn_keyboard_key_dark_pressed_on_holo.9.png b/java/res/drawable-xlarge/btn_keyboard_key_dark_pressed_on_holo.9.png Binary files differindex d0afa5b0d..7c80300e9 100644 --- a/java/res/drawable-xlarge/btn_keyboard_key_dark_pressed_on_holo.9.png +++ b/java/res/drawable-xlarge/btn_keyboard_key_dark_pressed_on_holo.9.png diff --git a/java/res/drawable-xlarge/btn_keyboard_key_light_normal_holo.9.png b/java/res/drawable-xlarge/btn_keyboard_key_light_normal_holo.9.png Binary files differindex a34fe5854..737de397b 100644 --- a/java/res/drawable-xlarge/btn_keyboard_key_light_normal_holo.9.png +++ b/java/res/drawable-xlarge/btn_keyboard_key_light_normal_holo.9.png diff --git a/java/res/drawable-xlarge/btn_keyboard_key_light_pressed_holo.9.png b/java/res/drawable-xlarge/btn_keyboard_key_light_pressed_holo.9.png Binary files differindex daa7f6c53..3dcd8323d 100644 --- a/java/res/drawable-xlarge/btn_keyboard_key_light_pressed_holo.9.png +++ b/java/res/drawable-xlarge/btn_keyboard_key_light_pressed_holo.9.png diff --git a/java/res/drawable-xlarge/key_hint_at_holo.9.png b/java/res/drawable-xlarge/key_hint_at_holo.9.png Binary files differindex 23369f630..2b8520a92 100644 --- a/java/res/drawable-xlarge/key_hint_at_holo.9.png +++ b/java/res/drawable-xlarge/key_hint_at_holo.9.png diff --git a/java/res/drawable-xlarge/key_hint_colon_holo.9.png b/java/res/drawable-xlarge/key_hint_colon_holo.9.png Binary files differindex 54c423710..14c46990d 100644 --- a/java/res/drawable-xlarge/key_hint_colon_holo.9.png +++ b/java/res/drawable-xlarge/key_hint_colon_holo.9.png diff --git a/java/res/drawable-xlarge/key_hint_comma_holo.9.png b/java/res/drawable-xlarge/key_hint_comma_holo.9.png Binary files differindex 2ebf24253..82e4a93b7 100644 --- a/java/res/drawable-xlarge/key_hint_comma_holo.9.png +++ b/java/res/drawable-xlarge/key_hint_comma_holo.9.png diff --git a/java/res/drawable-xlarge/key_hint_dash_holo.9.png b/java/res/drawable-xlarge/key_hint_dash_holo.9.png Binary files differindex f44668fba..2ee22ba79 100644 --- a/java/res/drawable-xlarge/key_hint_dash_holo.9.png +++ b/java/res/drawable-xlarge/key_hint_dash_holo.9.png diff --git a/java/res/drawable-xlarge/key_hint_doublecross_holo.9.png b/java/res/drawable-xlarge/key_hint_doublecross_holo.9.png Binary files differindex 9ca30f437..0da933239 100644 --- a/java/res/drawable-xlarge/key_hint_doublecross_holo.9.png +++ b/java/res/drawable-xlarge/key_hint_doublecross_holo.9.png diff --git a/java/res/drawable-xlarge/key_hint_equal_holo.9.png b/java/res/drawable-xlarge/key_hint_equal_holo.9.png Binary files differindex dee9a03ff..f5a9ba2f4 100644 --- a/java/res/drawable-xlarge/key_hint_equal_holo.9.png +++ b/java/res/drawable-xlarge/key_hint_equal_holo.9.png diff --git a/java/res/drawable-xlarge/key_hint_exclamation_holo.9.png b/java/res/drawable-xlarge/key_hint_exclamation_holo.9.png Binary files differindex 2c7271b0d..7230fb92a 100644 --- a/java/res/drawable-xlarge/key_hint_exclamation_holo.9.png +++ b/java/res/drawable-xlarge/key_hint_exclamation_holo.9.png diff --git a/java/res/drawable-xlarge/key_hint_larger_holo.9.png b/java/res/drawable-xlarge/key_hint_larger_holo.9.png Binary files differindex f789e0299..50652bb13 100644 --- a/java/res/drawable-xlarge/key_hint_larger_holo.9.png +++ b/java/res/drawable-xlarge/key_hint_larger_holo.9.png diff --git a/java/res/drawable-xlarge/key_hint_parenclose_holo.9.png b/java/res/drawable-xlarge/key_hint_parenclose_holo.9.png Binary files differindex aec225ac8..52ee86a0f 100644 --- a/java/res/drawable-xlarge/key_hint_parenclose_holo.9.png +++ b/java/res/drawable-xlarge/key_hint_parenclose_holo.9.png diff --git a/java/res/drawable-xlarge/key_hint_parenopen_holo.9.png b/java/res/drawable-xlarge/key_hint_parenopen_holo.9.png Binary files differindex 4347b9794..b0ed388ad 100644 --- a/java/res/drawable-xlarge/key_hint_parenopen_holo.9.png +++ b/java/res/drawable-xlarge/key_hint_parenopen_holo.9.png diff --git a/java/res/drawable-xlarge/key_hint_period_holo.9.png b/java/res/drawable-xlarge/key_hint_period_holo.9.png Binary files differindex a261350b6..8d798a57f 100644 --- a/java/res/drawable-xlarge/key_hint_period_holo.9.png +++ b/java/res/drawable-xlarge/key_hint_period_holo.9.png diff --git a/java/res/drawable-xlarge/key_hint_plus_holo.9.png b/java/res/drawable-xlarge/key_hint_plus_holo.9.png Binary files differindex 80121e5e2..f1d232e99 100644 --- a/java/res/drawable-xlarge/key_hint_plus_holo.9.png +++ b/java/res/drawable-xlarge/key_hint_plus_holo.9.png diff --git a/java/res/drawable-xlarge/key_hint_question_holo.9.png b/java/res/drawable-xlarge/key_hint_question_holo.9.png Binary files differindex c8e2fdab9..088550f5b 100644 --- a/java/res/drawable-xlarge/key_hint_question_holo.9.png +++ b/java/res/drawable-xlarge/key_hint_question_holo.9.png diff --git a/java/res/drawable-xlarge/key_hint_quote_holo.9.png b/java/res/drawable-xlarge/key_hint_quote_holo.9.png Binary files differindex 6cf7e0e37..51dcfac99 100644 --- a/java/res/drawable-xlarge/key_hint_quote_holo.9.png +++ b/java/res/drawable-xlarge/key_hint_quote_holo.9.png diff --git a/java/res/drawable-xlarge/key_hint_semicolon_holo.9.png b/java/res/drawable-xlarge/key_hint_semicolon_holo.9.png Binary files differindex d4e3f6904..7f9e8c90e 100644 --- a/java/res/drawable-xlarge/key_hint_semicolon_holo.9.png +++ b/java/res/drawable-xlarge/key_hint_semicolon_holo.9.png diff --git a/java/res/drawable-xlarge/key_hint_simplequote_holo.9.png b/java/res/drawable-xlarge/key_hint_simplequote_holo.9.png Binary files differindex 1d7463077..5e1a45c0e 100644 --- a/java/res/drawable-xlarge/key_hint_simplequote_holo.9.png +++ b/java/res/drawable-xlarge/key_hint_simplequote_holo.9.png diff --git a/java/res/drawable-xlarge/key_hint_slash_holo.9.png b/java/res/drawable-xlarge/key_hint_slash_holo.9.png Binary files differindex f00024c85..645586a30 100644 --- a/java/res/drawable-xlarge/key_hint_slash_holo.9.png +++ b/java/res/drawable-xlarge/key_hint_slash_holo.9.png diff --git a/java/res/drawable-xlarge/key_hint_smaller_holo.9.png b/java/res/drawable-xlarge/key_hint_smaller_holo.9.png Binary files differindex e5562b93f..2a0587cbd 100644 --- a/java/res/drawable-xlarge/key_hint_smaller_holo.9.png +++ b/java/res/drawable-xlarge/key_hint_smaller_holo.9.png diff --git a/java/res/drawable-xlarge/key_hint_star_holo.9.png b/java/res/drawable-xlarge/key_hint_star_holo.9.png Binary files differindex fd43ed5de..9f33b9830 100644 --- a/java/res/drawable-xlarge/key_hint_star_holo.9.png +++ b/java/res/drawable-xlarge/key_hint_star_holo.9.png diff --git a/java/res/drawable-xlarge/key_hint_underline_holo.9.png b/java/res/drawable-xlarge/key_hint_underline_holo.9.png Binary files differindex 680d9a6f5..fef1b6369 100644 --- a/java/res/drawable-xlarge/key_hint_underline_holo.9.png +++ b/java/res/drawable-xlarge/key_hint_underline_holo.9.png diff --git a/java/res/values-xlarge/dimens.xml b/java/res/values-xlarge/dimens.xml index 72110ca83..29838e846 100644 --- a/java/res/values-xlarge/dimens.xml +++ b/java/res/values-xlarge/dimens.xml @@ -20,9 +20,9 @@ <resources> <!-- key_height + key_bottom_gap = popup_key_height --> - <dimen name="key_height">0.450in</dimen> - <dimen name="key_bottom_gap">0.050in</dimen> - <dimen name="key_horizontal_gap">0.050in</dimen> + <dimen name="key_height">14.00mm</dimen> + <dimen name="key_bottom_gap">2.0mm</dimen> + <dimen name="key_horizontal_gap">2.0mm</dimen> <dimen name="popup_key_height">0.450in</dimen> <dimen name="keyboard_bottom_padding">0.10in</dimen> <!-- key_height x 1.6 --> diff --git a/java/res/xml-xlarge-land/popup_domains.xml b/java/res/xml-xlarge-land/popup_domains.xml new file mode 100644 index 000000000..9ed79c8a5 --- /dev/null +++ b/java/res/xml-xlarge-land/popup_domains.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, 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. +*/ +--> + +<Keyboard + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" + latin:keyWidth="5.0%p" + latin:horizontalGap="0px" + latin:verticalGap="0px" + latin:keyHeight="@dimen/popup_key_height" +> + <Row + latin:rowEdgeFlags="top|bottom" + > + <Key + latin:keyLabel="@string/popular_domain_1" + latin:keyOutputText="@string/popular_domain_1" + latin:keyEdgeFlags="left" /> + <Key + latin:keyLabel="@string/popular_domain_2" + latin:keyOutputText="@string/popular_domain_2" /> + <Key + latin:keyLabel="@string/popular_domain_3" + latin:keyOutputText="@string/popular_domain_3" /> + <Key + latin:keyLabel="@string/popular_domain_4" + latin:keyOutputText="@string/popular_domain_4" + latin:keyEdgeFlags="right" /> + </Row> +</Keyboard> diff --git a/java/res/xml-xlarge/kbd_phone.xml b/java/res/xml-xlarge/kbd_phone.xml index 107731f3b..8199b019b 100644 --- a/java/res/xml-xlarge/kbd_phone.xml +++ b/java/res/xml-xlarge/kbd_phone.xml @@ -20,7 +20,7 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyWidth="7.5%p" + latin:keyWidth="8.2%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" latin:keyHeight="@dimen/key_height" @@ -30,13 +30,13 @@ <Key latin:codes="@integer/key_tab" latin:keyLabel="@string/label_tab_key" - latin:keyWidth="15.0%p" + latin:keyWidth="12.1%p" latin:isModifier="true" latin:keyEdgeFlags="left" /> <!-- To match one character label size with "Tab", I placed spaces around the char '-' and '+'. --> <Spacer - latin:horizontalGap="6.0%p" /> + latin:horizontalGap="8.1%p" /> <Key latin:codes="45" latin:keyLabel=" - " /> @@ -44,21 +44,21 @@ latin:codes="43" latin:keyLabel=" + " /> <Spacer - latin:horizontalGap="11.5%p" /> + latin:horizontalGap="8.1%p" /> <Key latin:codes="49" latin:keyIcon="@drawable/sym_keyboard_num1" - latin:keyWidth="10.5%p " /> + latin:keyWidth="12.1%p " /> <Key latin:codes="50" latin:keyIcon="@drawable/sym_keyboard_num2" - latin:keyWidth="10.5%p " /> + latin:keyWidth="12.1%p " /> <Key latin:codes="51" latin:keyIcon="@drawable/sym_keyboard_num3" - latin:keyWidth="10.5%p " /> + latin:keyWidth="12.1%p " /> <Spacer - latin:horizontalGap="6.0%p" /> + latin:horizontalGap="4.0%p" /> <Key latin:codes="@integer/key_delete" latin:keyIcon="@drawable/sym_keyboard_delete" @@ -72,14 +72,14 @@ <Key latin:codes="@integer/key_symbol" latin:keyLabel="@string/label_more_key" - latin:keyWidth="15.0%p" + latin:keyWidth="12.1%p" latin:isModifier="true" latin:isSticky="true" latin:keyEdgeFlags="left" /> <!-- To match one character label size with "More", I placed spaces around the char ',' and '.'. --> <Spacer - latin:horizontalGap="6.0%p" /> + latin:horizontalGap="8.1%p" /> <Key latin:codes="44" latin:keyLabel=" , " /> @@ -87,21 +87,21 @@ latin:codes="46" latin:keyLabel=" . " /> <Spacer - latin:horizontalGap="11.5%p" /> + latin:horizontalGap="8.1%p" /> <Key latin:codes="52" latin:keyIcon="@drawable/sym_keyboard_num4" - latin:keyWidth="10.5%p " /> + latin:keyWidth="12.1%p " /> <Key latin:codes="53" latin:keyIcon="@drawable/sym_keyboard_num5" - latin:keyWidth="10.5%p " /> + latin:keyWidth="12.1%p " /> <Key latin:codes="54" latin:keyIcon="@drawable/sym_keyboard_num6" - latin:keyWidth="10.5%p " /> + latin:keyWidth="12.1%p " /> <Spacer - latin:horizontalGap="6.0%p" /> + latin:horizontalGap="4.0%p" /> <Key latin:codes="@integer/key_return" latin:keyIcon="@drawable/sym_keyboard_return" @@ -116,7 +116,7 @@ <!-- There is an empty area bellow the "More" key and left of the "(" key. To ignore the touch event on the area, "(" is intentionally not marked as a left edge key. --> <Spacer - latin:horizontalGap="21.0%p" /> + latin:horizontalGap="20.2%p" /> <Key latin:codes="40" latin:keyLabel=" ( " /> @@ -124,19 +124,19 @@ latin:codes="41" latin:keyLabel=" ) " /> <Spacer - latin:horizontalGap="11.5%p" /> + latin:horizontalGap="8.1%p" /> <Key latin:codes="55" latin:keyIcon="@drawable/sym_keyboard_num7" - latin:keyWidth="10.5%p " /> + latin:keyWidth="12.1%p " /> <Key latin:codes="56" latin:keyIcon="@drawable/sym_keyboard_num8" - latin:keyWidth="10.5%p " /> + latin:keyWidth="12.1%p " /> <Key latin:codes="57" latin:keyIcon="@drawable/sym_keyboard_num9" - latin:keyWidth="10.5%p " /> + latin:keyWidth="12.1%p " /> <!-- There is an empty area bellow the "Enter" key and right of the "9" key. To ignore the touch event on the area, "9" is intentionally not marked as a right edge key. --> </Row> @@ -145,26 +145,26 @@ <!-- There is an empty area bellow the "More" key and left of the "space" key. To ignore the touch event on the area, "space" is intentionally not marked as a left edge key. --> <Spacer - latin:horizontalGap="21.0%p" /> + latin:horizontalGap="20.2%p" /> <Key latin:codes="@integer/key_space" latin:keyIcon="@drawable/sym_keyboard_space" latin:iconPreview="@drawable/sym_keyboard_feedback_space" - latin:keyWidth="15.0%p" /> + latin:keyWidth="16.4%p" /> <Spacer - latin:horizontalGap="11.5%p" /> + latin:horizontalGap="8.1%p" /> <Key latin:codes="42" latin:keyIcon="@drawable/sym_keyboard_numstar" - latin:keyWidth="10.5%p " /> + latin:keyWidth="12.1%p " /> <Key latin:codes="48" latin:keyIcon="@drawable/sym_keyboard_num0" - latin:keyWidth="10.5%p " /> + latin:keyWidth="12.1%p " /> <Key latin:codes="35" latin:keyIcon="@drawable/sym_keyboard_numpound" - latin:keyWidth="10.5%p " /> + latin:keyWidth="12.1%p " /> <!-- There is an empty area bellow the "Enter" key and right of the "#" key. To ignore the touch event on the area, "#" is intentionally not marked as a right edge key. --> </Row> diff --git a/java/res/xml-xlarge/kbd_phone_symbols.xml b/java/res/xml-xlarge/kbd_phone_symbols.xml index a7dcd325a..2e604d374 100644 --- a/java/res/xml-xlarge/kbd_phone_symbols.xml +++ b/java/res/xml-xlarge/kbd_phone_symbols.xml @@ -20,7 +20,7 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyWidth="7.5%p" + latin:keyWidth="8.2%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" latin:keyHeight="@dimen/key_height" @@ -30,38 +30,38 @@ <Key latin:codes="@integer/key_tab" latin:keyLabel="@string/label_tab_key" - latin:keyWidth="15.0%p" + latin:keyWidth="12.1%p" latin:isModifier="true" latin:keyEdgeFlags="left" /> <Spacer latin:horizontalGap="4.0%p" /> <Key - latin:codes="44" - latin:keyLabel="@string/label_pause_key" /> - <!-- To match one character label size with "Tab" and "Pause, I placed spaces around the - char '-' and '+'. --> - <Key latin:codes="45" latin:keyLabel=" - " /> <Key latin:codes="43" latin:keyLabel=" + " /> + <Key + latin:codes="44" + latin:keyLabel="@string/label_pause_key" /> + <!-- To match one character label size with "Tab" and "Pause, I placed spaces around the + char '-' and '+'. --> <Spacer - latin:horizontalGap="6.0%p" /> + latin:horizontalGap="4.0%p" /> <Key latin:codes="49" latin:keyIcon="@drawable/sym_keyboard_num1" - latin:keyWidth="10.5%p " /> + latin:keyWidth="12.1%p " /> <Key latin:codes="50" latin:keyIcon="@drawable/sym_keyboard_num2" - latin:keyWidth="10.5%p " /> + latin:keyWidth="12.1%p " /> <Key latin:codes="51" latin:keyIcon="@drawable/sym_keyboard_num3" - latin:keyWidth="10.5%p " /> + latin:keyWidth="12.1%p " /> <Spacer - latin:horizontalGap="6.0%p" /> + latin:horizontalGap="4.0%p" /> <Key latin:codes="@integer/key_delete" latin:keyIcon="@drawable/sym_keyboard_delete" @@ -75,39 +75,39 @@ <Key latin:codes="@integer/key_symbol" latin:keyLabel="@string/label_more_key" - latin:keyWidth="15.0%p" + latin:keyWidth="12.1%p" latin:isModifier="true" latin:isSticky="true" latin:keyEdgeFlags="left" /> <Spacer latin:horizontalGap="4.0%p" /> <Key - latin:codes="59" - latin:keyLabel="@string/label_wait_key" /> - <!-- To match one character label size with "More" and "Wait", I placed spaces around the - char ',' and '.'. --> - <Key latin:codes="44" latin:keyLabel=" , " /> <Key latin:codes="46" latin:keyLabel=" . " /> + <Key + latin:codes="59" + latin:keyLabel="@string/label_wait_key" /> + <!-- To match one character label size with "More" and "Wait", I placed spaces around the + char ',' and '.'. --> <Spacer - latin:horizontalGap="6.0%p" /> + latin:horizontalGap="4.0%p" /> <Key latin:codes="52" latin:keyIcon="@drawable/sym_keyboard_num4" - latin:keyWidth="10.5%p " /> + latin:keyWidth="12.1%p " /> <Key latin:codes="53" latin:keyIcon="@drawable/sym_keyboard_num5" - latin:keyWidth="10.5%p " /> + latin:keyWidth="12.1%p " /> <Key latin:codes="54" latin:keyIcon="@drawable/sym_keyboard_num6" - latin:keyWidth="10.5%p " /> + latin:keyWidth="12.1%p " /> <Spacer - latin:horizontalGap="6.0%p" /> + latin:horizontalGap="4.0%p" /> <Key latin:codes="@integer/key_return" latin:keyIcon="@drawable/sym_keyboard_return" @@ -122,30 +122,30 @@ <!-- There is an empty area bellow the "More" key and left of the "(" key. To ignore the touch event on the area, "(" is intentionally not marked as a left edge key. --> <Spacer - latin:horizontalGap="19.0%p" /> - <Key - latin:codes="78" - latin:keyLabel=" N " /> + latin:horizontalGap="16.1%p" /> <Key latin:codes="40" latin:keyLabel=" ( " /> <Key latin:codes="41" latin:keyLabel=" ) " /> + <Key + latin:codes="78" + latin:keyLabel=" N " /> <Spacer - latin:horizontalGap="6.0%p" /> + latin:horizontalGap="4.0%p" /> <Key latin:codes="55" latin:keyIcon="@drawable/sym_keyboard_num7" - latin:keyWidth="10.5%p " /> + latin:keyWidth="12.1%p " /> <Key latin:codes="56" latin:keyIcon="@drawable/sym_keyboard_num8" - latin:keyWidth="10.5%p " /> + latin:keyWidth="12.1%p " /> <Key latin:codes="57" latin:keyIcon="@drawable/sym_keyboard_num9" - latin:keyWidth="10.5%p " /> + latin:keyWidth="12.1%p " /> <!-- There is an empty area bellow the "Enter" key and right of the "9" key. To ignore the touch event on the area, "9" is intentionally not marked as a right edge key. --> </Row> @@ -154,26 +154,26 @@ <!-- There is an empty area bellow the "More" key and left of the "space" key. To ignore the touch event on the area, "space" is intentionally not marked as a left edge key. --> <Spacer - latin:horizontalGap="19.0%p" /> + latin:horizontalGap="16.1%p" /> <Key latin:codes="@integer/key_space" latin:keyIcon="@drawable/sym_keyboard_space" latin:iconPreview="@drawable/sym_keyboard_feedback_space" - latin:keyWidth="22.5%p" /> + latin:keyWidth="24.6%p" /> <Spacer - latin:horizontalGap="6.0%p" /> + latin:horizontalGap="4.0%p" /> <Key latin:codes="42" latin:keyIcon="@drawable/sym_keyboard_numstar" - latin:keyWidth="10.5%p " /> + latin:keyWidth="12.1%p " /> <Key latin:codes="48" latin:keyIcon="@drawable/sym_keyboard_num0" - latin:keyWidth="10.5%p " /> + latin:keyWidth="12.1%p " /> <Key latin:codes="35" latin:keyIcon="@drawable/sym_keyboard_numpound" - latin:keyWidth="10.5%p " /> + latin:keyWidth="12.1%p " /> <!-- There is an empty area bellow the "Enter" key and right of the "#" key. To ignore the touch event on the area, "#" is intentionally not marked as a right edge key. --> </Row> diff --git a/java/res/xml-xlarge/kbd_qwerty.xml b/java/res/xml-xlarge/kbd_qwerty.xml index 6836c2d61..b4b880ed7 100644 --- a/java/res/xml-xlarge/kbd_qwerty.xml +++ b/java/res/xml-xlarge/kbd_qwerty.xml @@ -20,7 +20,7 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyWidth="7.5%p" + latin:keyWidth="8.2%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" latin:keyHeight="@dimen/key_height" @@ -99,7 +99,7 @@ <Row latin:keyboardMode="@+id/mode_im" > - <include latin:keyboardLayout="@xml/kbd_qwerty_row4_im" /> + <include latin:keyboardLayout="@xml/kbd_qwerty_row4_common" /> </Row> <Row latin:keyboardMode="@+id/mode_webentry" diff --git a/java/res/xml-xlarge/kbd_qwerty_row1_common.xml b/java/res/xml-xlarge/kbd_qwerty_row1_common.xml index 677da2527..95bed0d22 100644 --- a/java/res/xml-xlarge/kbd_qwerty_row1_common.xml +++ b/java/res/xml-xlarge/kbd_qwerty_row1_common.xml @@ -68,16 +68,10 @@ latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_p" /> <Key - latin:keyLabel="=" - latin:temporaryShiftKeyLabel="+" - latin:keyHintIcon="@drawable/key_hint_plus_holo" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="+" /> - <Key latin:codes="@integer/key_delete" latin:keyIcon="@drawable/sym_keyboard_delete" latin:iconPreview="@drawable/sym_keyboard_feedback_delete" - latin:keyWidth="10.5%p" + latin:keyWidth="11.0%p" latin:isModifier="true" latin:isRepeatable="true" latin:keyEdgeFlags="right" /> diff --git a/java/res/xml-xlarge/kbd_qwerty_row2_common.xml b/java/res/xml-xlarge/kbd_qwerty_row2_common.xml index 907de3cbb..54befcabe 100644 --- a/java/res/xml-xlarge/kbd_qwerty_row2_common.xml +++ b/java/res/xml-xlarge/kbd_qwerty_row2_common.xml @@ -24,7 +24,7 @@ <Key latin:codes="@integer/key_symbol" latin:keyLabel="@string/label_symbol_key" - latin:keyWidth="8.75%p" + latin:keyWidth="9.7%p" latin:isModifier="true" latin:keyEdgeFlags="left" /> <Key @@ -56,12 +56,6 @@ latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_l" /> <Key - latin:keyLabel=";" - latin:temporaryShiftKeyLabel=":" - latin:keyHintIcon="@drawable/key_hint_colon_holo" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters=":" /> - <Key latin:keyLabel="\'" latin:temporaryShiftKeyLabel=""" latin:keyHintIcon="@drawable/key_hint_quote_holo" @@ -71,7 +65,7 @@ latin:codes="@integer/key_return" latin:keyIcon="@drawable/sym_keyboard_return" latin:iconPreview="@drawable/sym_keyboard_feedback_return" - latin:keyWidth="8.75%p" + latin:keyWidth="8.3%p" latin:isModifier="true" latin:keyEdgeFlags="right" /> </merge> diff --git a/java/res/xml-xlarge/kbd_qwerty_row2_email.xml b/java/res/xml-xlarge/kbd_qwerty_row2_email.xml index e274537f0..7fd43ce68 100644 --- a/java/res/xml-xlarge/kbd_qwerty_row2_email.xml +++ b/java/res/xml-xlarge/kbd_qwerty_row2_email.xml @@ -24,7 +24,7 @@ <Key latin:codes="@integer/key_symbol" latin:keyLabel="@string/label_symbol_key" - latin:keyWidth="8.75%p" + latin:keyWidth="9.7%p" latin:isModifier="true" latin:keyEdgeFlags="left" /> <Key @@ -56,18 +56,12 @@ latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_l" /> <Key - latin:keyLabel=";" /> - <Key - latin:keyLabel="\'" - latin:temporaryShiftKeyLabel=""" - latin:keyHintIcon="@drawable/key_hint_quote_holo" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters=""" /> + latin:keyLabel="\@" /> <Key latin:codes="@integer/key_return" latin:keyIcon="@drawable/sym_keyboard_return" latin:iconPreview="@drawable/sym_keyboard_feedback_return" - latin:keyWidth="8.75%p" + latin:keyWidth="8.3%p" latin:isModifier="true" latin:keyEdgeFlags="right" /> </merge> diff --git a/java/res/xml-xlarge/kbd_qwerty_row3_common.xml b/java/res/xml-xlarge/kbd_qwerty_row3_common.xml index b3fa466f2..eb1e18376 100644 --- a/java/res/xml-xlarge/kbd_qwerty_row3_common.xml +++ b/java/res/xml-xlarge/kbd_qwerty_row3_common.xml @@ -25,7 +25,7 @@ latin:codes="@integer/key_shift" latin:keyIcon="@drawable/sym_keyboard_shift" latin:iconPreview="@drawable/sym_keyboard_feedback_shift" - latin:keyWidth="12.5%p" + latin:keyWidth="13.1%p" latin:isModifier="true" latin:isSticky="true" latin:keyEdgeFlags="left" /> @@ -53,18 +53,12 @@ latin:keyLabel="m" /> <Key latin:keyLabel="," - latin:temporaryShiftKeyLabel="*" - latin:keyHintIcon="@drawable/key_hint_star_holo" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="*" /> - <Key - latin:keyLabel="." latin:temporaryShiftKeyLabel="!" latin:keyHintIcon="@drawable/key_hint_exclamation_holo" latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="!" /> <Key - latin:keyLabel="/" + latin:keyLabel="." latin:temporaryShiftKeyLabel="\?" latin:keyHintIcon="@drawable/key_hint_question_holo" latin:popupKeyboard="@xml/kbd_popup_template" @@ -73,7 +67,7 @@ latin:codes="@integer/key_shift" latin:keyIcon="@drawable/sym_keyboard_shift" latin:iconPreview="@drawable/sym_keyboard_feedback_shift" - latin:keyWidth="12.5%p" + latin:keyWidth="13.1%p" latin:isModifier="true" latin:isSticky="true" latin:keyEdgeFlags="right" /> diff --git a/java/res/xml-xlarge/kbd_qwerty_row3_email.xml b/java/res/xml-xlarge/kbd_qwerty_row3_email.xml index d498406c7..d9e354210 100644 --- a/java/res/xml-xlarge/kbd_qwerty_row3_email.xml +++ b/java/res/xml-xlarge/kbd_qwerty_row3_email.xml @@ -25,7 +25,7 @@ latin:codes="@integer/key_shift" latin:keyIcon="@drawable/sym_keyboard_shift" latin:iconPreview="@drawable/sym_keyboard_feedback_shift" - latin:keyWidth="12.5%p" + latin:keyWidth="13.1%p" latin:isModifier="true" latin:isSticky="true" latin:keyEdgeFlags="left" /> @@ -56,12 +56,10 @@ <Key latin:keyLabel="." /> <Key - latin:keyLabel="\@" /> - <Key latin:codes="@integer/key_shift" latin:keyIcon="@drawable/sym_keyboard_shift" latin:iconPreview="@drawable/sym_keyboard_feedback_shift" - latin:keyWidth="12.5%p" + latin:keyWidth="13.1%p" latin:isModifier="true" latin:isSticky="true" latin:keyEdgeFlags="right" /> diff --git a/java/res/xml-xlarge/kbd_qwerty_row4_common.xml b/java/res/xml-xlarge/kbd_qwerty_row4_common.xml index 33a7472e2..2bcd71d7f 100644 --- a/java/res/xml-xlarge/kbd_qwerty_row4_common.xml +++ b/java/res/xml-xlarge/kbd_qwerty_row4_common.xml @@ -22,35 +22,34 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Spacer - latin:horizontalGap="16.25%p" /> + latin:horizontalGap="15.1%p" /> <Key - latin:keyLabel="(" - latin:temporaryShiftKeyLabel="<" - latin:keyHintIcon="@drawable/key_hint_smaller_holo" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="<" /> + latin:keyLabel=":-)" + latin:keyOutputText=":-)" + latin:keyHintIcon="@drawable/hint_popup" + latin:popupKeyboard="@xml/popup_smileys" /> <Key - latin:keyLabel=")" - latin:temporaryShiftKeyLabel=">" - latin:keyHintIcon="@drawable/key_hint_larger_holo" + latin:keyLabel="=" + latin:temporaryShiftKeyLabel="+" + latin:keyHintIcon="@drawable/key_hint_plus_holo" latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters=">" /> <Key latin:codes="@integer/key_space" latin:keyIcon="@drawable/sym_keyboard_space" latin:iconPreview="@drawable/sym_keyboard_feedback_space" - latin:keyWidth="37.5%p" + latin:keyWidth="37.0%p" latin:isModifier="true" /> <Key + latin:keyLabel="-" + latin:temporaryShiftKeyLabel="/" + latin:keyHintIcon="@drawable/key_hint_slash_holo" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="/" /> + <Key latin:keyLabel="_" latin:temporaryShiftKeyLabel="\@" latin:keyHintIcon="@drawable/key_hint_at_holo" latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="\@" /> - <Key - latin:keyLabel="-" - latin:temporaryShiftKeyLabel="#" - latin:keyHintIcon="@drawable/key_hint_doublecross_holo" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="#" /> </merge> diff --git a/java/res/xml-xlarge/kbd_qwerty_row4_email.xml b/java/res/xml-xlarge/kbd_qwerty_row4_email.xml index c5a5b061b..f10cf4bf8 100644 --- a/java/res/xml-xlarge/kbd_qwerty_row4_email.xml +++ b/java/res/xml-xlarge/kbd_qwerty_row4_email.xml @@ -22,16 +22,18 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Spacer - latin:horizontalGap="16.25%p" /> + latin:horizontalGap="15.1%p" /> <Key latin:keyLabel=".com" latin:keyOutputText=".com" - latin:keyWidth="15.0%p" /> + latin:keyHintIcon="@drawable/hint_popup" + latin:popupKeyboard="@xml/popup_domains" + latin:keyWidth="16.4%p" /> <Key latin:codes="@integer/key_space" latin:keyIcon="@drawable/sym_keyboard_space" latin:iconPreview="@drawable/sym_keyboard_feedback_space" - latin:keyWidth="37.5%p" + latin:keyWidth="37.0%p" latin:isModifier="true" /> <Key latin:keyLabel="_" /> diff --git a/java/res/xml-xlarge/kbd_qwerty_row4_im.xml b/java/res/xml-xlarge/kbd_qwerty_row4_im.xml deleted file mode 100644 index 0efa9e520..000000000 --- a/java/res/xml-xlarge/kbd_qwerty_row4_im.xml +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2010, 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" -> - <Spacer - latin:horizontalGap="16.25%p" /> - <Key - latin:keyLabel=":-)" - latin:keyOutputText=":-)" - latin:keyHintIcon="@drawable/hint_popup" - latin:popupKeyboard="@xml/popup_smileys" - latin:keyWidth="15.0%p" /> - <Key - latin:codes="@integer/key_space" - latin:keyIcon="@drawable/sym_keyboard_space" - latin:iconPreview="@drawable/sym_keyboard_feedback_space" - latin:keyWidth="37.5%p" - latin:isModifier="true" /> - <Key - latin:keyLabel="_" - latin:temporaryShiftKeyLabel="\@" - latin:keyHintIcon="@drawable/key_hint_at_holo" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="\@" /> - <Key - latin:keyLabel="-" - latin:temporaryShiftKeyLabel="#" - latin:keyHintIcon="@drawable/key_hint_doublecross_holo" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="#" /> -</merge> diff --git a/java/res/xml-xlarge/kbd_qwerty_row4_url.xml b/java/res/xml-xlarge/kbd_qwerty_row4_url.xml index 48924bb4a..420d136eb 100644 --- a/java/res/xml-xlarge/kbd_qwerty_row4_url.xml +++ b/java/res/xml-xlarge/kbd_qwerty_row4_url.xml @@ -22,27 +22,29 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Spacer - latin:horizontalGap="16.25%p" /> + latin:horizontalGap="15.1%p" /> <Key latin:keyLabel=".com" latin:keyOutputText=".com" - latin:keyWidth="15.0%p" /> + latin:keyHintIcon="@drawable/hint_popup" + latin:popupKeyboard="@xml/popup_domains" + latin:keyWidth="16.4%p" /> <Key latin:codes="@integer/key_space" latin:keyIcon="@drawable/sym_keyboard_space" latin:iconPreview="@drawable/sym_keyboard_feedback_space" - latin:keyWidth="37.5%p" + latin:keyWidth="37.0%p" latin:isModifier="true" /> <Key - latin:keyLabel="_" - latin:temporaryShiftKeyLabel="\@" - latin:keyHintIcon="@drawable/key_hint_at_holo" + latin:keyLabel="-" + latin:temporaryShiftKeyLabel="/" + latin:keyHintIcon="@drawable/key_hint_slash_holo" latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="\@" /> + latin:popupCharacters="/" /> <Key - latin:keyLabel="-" - latin:temporaryShiftKeyLabel="#" - latin:keyHintIcon="@drawable/key_hint_doublecross_holo" + latin:keyLabel="_" + latin:temporaryShiftKeyLabel=":" + latin:keyHintIcon="@drawable/key_hint_colon_holo" latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="#" /> + latin:popupCharacters=":" /> </merge> diff --git a/java/res/xml-xlarge/kbd_symbols.xml b/java/res/xml-xlarge/kbd_symbols.xml index 34fc11419..53981513b 100644 --- a/java/res/xml-xlarge/kbd_symbols.xml +++ b/java/res/xml-xlarge/kbd_symbols.xml @@ -20,7 +20,7 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyWidth="7.5%p" + latin:keyWidth="8.2%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" latin:keyHeight="@dimen/key_height" @@ -54,12 +54,10 @@ <Key latin:keyLabel="0" /> <Key - latin:keyLabel="~" /> - <Key latin:codes="@integer/key_delete" latin:keyIcon="@drawable/sym_keyboard_delete" latin:iconPreview="@drawable/sym_keyboard_feedback_delete" - latin:keyWidth="10.5%p" + latin:keyWidth="11.0%p" latin:isModifier="true" latin:isRepeatable="true" latin:keyEdgeFlags="right" /> @@ -68,7 +66,7 @@ <Key latin:codes="@integer/key_symbol" latin:keyLabel="@string/label_alpha_key" - latin:keyWidth="8.75%p" + latin:keyWidth="9.7%p" latin:isModifier="true" latin:keyEdgeFlags="left" /> <Key @@ -80,8 +78,6 @@ <Key latin:keyLabel="%" /> <Key - latin:keyLabel="^" /> - <Key latin:keyLabel="&" /> <Key latin:keyLabel="*" /> @@ -97,7 +93,7 @@ latin:codes="@integer/key_return" latin:keyIcon="@drawable/sym_keyboard_return" latin:iconPreview="@drawable/sym_keyboard_feedback_return" - latin:keyWidth="8.75%p" + latin:keyWidth="8.3%p" latin:isModifier="true" latin:keyEdgeFlags="right" /> </Row> @@ -106,13 +102,11 @@ latin:codes="@integer/key_shift" latin:keyLabel="@string/label_more_key" latin:iconPreview="@drawable/sym_keyboard_feedback_shift" - latin:keyWidth="12.5%p" + latin:keyWidth="13.1%p" latin:isModifier="true" latin:isSticky="true" latin:keyEdgeFlags="left" /> <Key - latin:keyLabel="!" /> - <Key latin:keyLabel=""" /> <Key latin:keyLabel="\'" /> @@ -123,18 +117,18 @@ <Key latin:keyLabel="/" /> <Key - latin:keyLabel="\\" /> - <Key latin:keyLabel="," /> <Key latin:keyLabel="." /> <Key + latin:keyLabel="!" /> + <Key latin:keyLabel="\?" /> <Key latin:codes="@integer/key_shift" latin:keyLabel="@string/label_more_key" latin:iconPreview="@drawable/sym_keyboard_feedback_shift" - latin:keyWidth="12.5%p" + latin:keyWidth="13.1%p" latin:isModifier="true" latin:isSticky="true" latin:keyEdgeFlags="right" /> @@ -142,20 +136,12 @@ <!-- This row is intentionally not marked as a bottom row --> <Row> <Spacer - latin:horizontalGap="16.25%p" /> - <Key - latin:keyLabel="<" /> - <Key - latin:keyLabel=">" /> + latin:horizontalGap="31.5%p" /> <Key latin:codes="@integer/key_space" latin:keyIcon="@drawable/sym_keyboard_space" latin:iconPreview="@drawable/sym_keyboard_feedback_space" - latin:keyWidth="37.5%p" + latin:keyWidth="37.0%p" latin:isModifier="true" /> - <Key - latin:keyLabel="[" /> - <Key - latin:keyLabel="]" /> </Row> </Keyboard> diff --git a/java/res/xml-xlarge/kbd_symbols_shift.xml b/java/res/xml-xlarge/kbd_symbols_shift.xml index 8ed1c1107..b8f8136d3 100644 --- a/java/res/xml-xlarge/kbd_symbols_shift.xml +++ b/java/res/xml-xlarge/kbd_symbols_shift.xml @@ -20,7 +20,7 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyWidth="7.5%p" + latin:keyWidth="8.2%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" latin:keyHeight="@dimen/key_height" @@ -34,9 +34,9 @@ latin:isModifier="true" latin:keyEdgeFlags="left" /> <Key - latin:keyLabel="∞" /> + latin:keyLabel="~" /> <Key - latin:keyLabel="±" /> + latin:keyLabel="`" /> <Key latin:keyLabel="|" /> <Key @@ -50,16 +50,14 @@ <Key latin:keyLabel="×" /> <Key - latin:keyLabel="±" /> - <Key - latin:keyLabel="∆" /> + latin:keyLabel="{" /> <Key - latin:keyLabel="≈" /> + latin:keyLabel="}" /> <Key latin:codes="@integer/key_delete" latin:keyIcon="@drawable/sym_keyboard_delete" latin:iconPreview="@drawable/sym_keyboard_feedback_delete" - latin:keyWidth="10.5%p" + latin:keyWidth="11.0%p" latin:isModifier="true" latin:isRepeatable="true" latin:keyEdgeFlags="right" /> @@ -68,7 +66,7 @@ <Key latin:codes="@integer/key_symbol" latin:keyLabel="@string/label_alpha_key" - latin:keyWidth="8.75%p" + latin:keyWidth="9.7%p" latin:isModifier="true" latin:keyEdgeFlags="left" /> <Key @@ -76,28 +74,26 @@ <Key latin:keyLabel="¢" /> <Key - latin:keyLabel="¥" /> - <Key latin:keyLabel="€" /> <Key - latin:keyLabel="¼" /> - <Key - latin:keyLabel="½" /> + latin:keyLabel="¥" /> <Key - latin:keyLabel="¾" /> + latin:keyLabel="^" /> <Key latin:keyLabel="_" /> <Key latin:keyLabel="=" /> <Key - latin:keyLabel="{" /> + latin:keyLabel="±" /> <Key - latin:keyLabel="}" /> + latin:keyLabel="[" /> + <Key + latin:keyLabel="]" /> <Key latin:codes="@integer/key_return" latin:keyIcon="@drawable/sym_keyboard_return" latin:iconPreview="@drawable/sym_keyboard_feedback_return" - latin:keyWidth="8.75%p" + latin:keyWidth="8.3%p" latin:isModifier="true" latin:keyEdgeFlags="right" /> </Row> @@ -106,35 +102,33 @@ latin:codes="@integer/key_shift" latin:keyLabel="@string/label_more_key" latin:iconPreview="@drawable/sym_keyboard_feedback_shift" - latin:keyWidth="12.5%p" + latin:keyWidth="13.1%p" latin:isModifier="true" latin:isSticky="true" latin:keyEdgeFlags="left" /> <Key - latin:keyLabel="¡" /> + latin:keyLabel="<" /> <Key - latin:keyLabel="°" /> + latin:keyLabel=">" /> <Key latin:keyLabel="©" /> <Key latin:keyLabel="®" /> <Key - latin:keyLabel="¶" /> - <Key - latin:keyLabel="§" /> + latin:keyLabel="\\" /> <Key - latin:keyLabel="¤" /> + latin:keyLabel="°" /> <Key - latin:keyLabel="¬" /> + latin:keyLabel="∞" /> <Key - latin:keyLabel="…" /> + latin:keyLabel="¡" /> <Key latin:keyLabel="¿" /> <Key latin:codes="@integer/key_shift" latin:keyLabel="@string/label_more_key" latin:iconPreview="@drawable/sym_keyboard_feedback_shift" - latin:keyWidth="12.5%p" + latin:keyWidth="13.1%p" latin:isModifier="true" latin:isSticky="true" latin:keyEdgeFlags="right" /> @@ -142,20 +136,12 @@ <!-- This row is intentionally not marked as a bottom row --> <Row> <Spacer - latin:horizontalGap="16.25%p" /> - <Key - latin:keyLabel="≤" /> - <Key - latin:keyLabel="≥" /> + latin:horizontalGap="31.5%p" /> <Key latin:codes="@integer/key_space" latin:keyIcon="@drawable/sym_keyboard_space" latin:iconPreview="@drawable/sym_keyboard_feedback_space" - latin:keyWidth="37.5%p" + latin:keyWidth="37.0%p" latin:isModifier="true" /> - <Key - latin:keyLabel="²" /> - <Key - latin:keyLabel="³" /> </Row> </Keyboard> diff --git a/java/res/xml-xlarge/popup_domains.xml b/java/res/xml-xlarge/popup_domains.xml new file mode 100644 index 000000000..d20bcb116 --- /dev/null +++ b/java/res/xml-xlarge/popup_domains.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, 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. +*/ +--> + +<Keyboard + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" + latin:keyWidth="15%p" + latin:horizontalGap="0px" + latin:verticalGap="0px" + latin:keyHeight="@dimen/popup_key_height" +> + <Row + latin:rowEdgeFlags="top|bottom" + > + <Key + latin:keyLabel="@string/popular_domain_1" + latin:keyOutputText="@string/popular_domain_1" + latin:keyEdgeFlags="left" /> + <Key + latin:keyLabel="@string/popular_domain_2" + latin:keyOutputText="@string/popular_domain_2" /> + <Key + latin:keyLabel="@string/popular_domain_3" + latin:keyOutputText="@string/popular_domain_3" /> + <Key + latin:keyLabel="@string/popular_domain_4" + latin:keyOutputText="@string/popular_domain_4" + latin:keyEdgeFlags="right" /> + </Row> +</Keyboard> |
