From d8638ff34b6554eca060d7f778cd3420a0f6e777 Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Thu, 26 May 2011 12:50:38 +0900 Subject: [PATCH] Introduce new 7" keyboard layout (DO NOT MERGE) This change only changes QWERTY layout. The phone/number and AZERTY/QWERTZ/Russian/Scandinavia layouts will be fixed soon. Bug: 4442045 Change-Id: Ib42c84e1d05fee513b1b7680ef0dcf755298d444 --- java/res/values-sw600dp-land/dimens.xml | 4 +- java/res/values-sw600dp/config.xml | 1 + java/res/values-sw600dp/dimens.xml | 4 +- java/res/xml-sw600dp/kbd_key_styles.xml | 264 ++++++-------------- java/res/xml-sw600dp/kbd_qwerty_row1.xml | 7 +- java/res/xml-sw600dp/kbd_qwerty_row2.xml | 9 +- java/res/xml-sw600dp/kbd_qwerty_row3.xml | 32 ++- java/res/xml-sw600dp/kbd_qwerty_row4.xml | 268 +++++++++++++++------ java/res/xml-sw600dp/kbd_settings.xml | 86 +++++++ java/res/xml-sw600dp/kbd_symbols.xml | 148 +++++++++--- java/res/xml-sw600dp/kbd_symbols_shift.xml | 104 +++++--- 11 files changed, 577 insertions(+), 350 deletions(-) create mode 100644 java/res/xml-sw600dp/kbd_settings.xml diff --git a/java/res/values-sw600dp-land/dimens.xml b/java/res/values-sw600dp-land/dimens.xml index 5adb6f338..ee30d98bc 100644 --- a/java/res/values-sw600dp-land/dimens.xml +++ b/java/res/values-sw600dp-land/dimens.xml @@ -31,8 +31,8 @@ 13.0mm - 28dip - 20dip + 25dip + 18dip 18dip 40.0mm diff --git a/java/res/values-sw600dp/config.xml b/java/res/values-sw600dp/config.xml index fe5aee3cf..4f6d684c4 100644 --- a/java/res/values-sw600dp/config.xml +++ b/java/res/values-sw600dp/config.xml @@ -21,6 +21,7 @@ true false + true false false diff --git a/java/res/values-sw600dp/dimens.xml b/java/res/values-sw600dp/dimens.xml index 47d5e0f36..3d623d975 100644 --- a/java/res/values-sw600dp/dimens.xml +++ b/java/res/values-sw600dp/dimens.xml @@ -37,8 +37,8 @@ -13.0mm - 26dip - 16dip + 24dip + 14dip 24dip 6dip diff --git a/java/res/xml-sw600dp/kbd_key_styles.xml b/java/res/xml-sw600dp/kbd_key_styles.xml index c2b869763..6be6a2c30 100644 --- a/java/res/xml-sw600dp/kbd_key_styles.xml +++ b/java/res/xml-sw600dp/kbd_key_styles.xml @@ -45,7 +45,15 @@ - + + + @@ -75,60 +89,39 @@ latin:iconPreview="@drawable/sym_keyboard_feedback_delete" latin:parentStyle="functionalKeyStyle" latin:isRepeatable="true" /> - - - - - - - - - + + + + - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + latin:popupCharacters="@string/alternates_for_popular_domain" /> - - diff --git a/java/res/xml-sw600dp/kbd_qwerty_row1.xml b/java/res/xml-sw600dp/kbd_qwerty_row1.xml index 3084ebaf2..d3d5b25e6 100644 --- a/java/res/xml-sw600dp/kbd_qwerty_row1.xml +++ b/java/res/xml-sw600dp/kbd_qwerty_row1.xml @@ -22,7 +22,7 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > + diff --git a/java/res/xml-sw600dp/kbd_qwerty_row2.xml b/java/res/xml-sw600dp/kbd_qwerty_row2.xml index 07dd66f6b..aecb4f4a9 100644 --- a/java/res/xml-sw600dp/kbd_qwerty_row2.xml +++ b/java/res/xml-sw600dp/kbd_qwerty_row2.xml @@ -22,10 +22,10 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > + latin:horizontalGap="4.5%p" /> + diff --git a/java/res/xml-sw600dp/kbd_qwerty_row3.xml b/java/res/xml-sw600dp/kbd_qwerty_row3.xml index c8e78d440..e50f9079c 100644 --- a/java/res/xml-sw600dp/kbd_qwerty_row3.xml +++ b/java/res/xml-sw600dp/kbd_qwerty_row3.xml @@ -22,11 +22,11 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > + + + + + + + + + + diff --git a/java/res/xml-sw600dp/kbd_qwerty_row4.xml b/java/res/xml-sw600dp/kbd_qwerty_row4.xml index 0b3525b79..57367462a 100644 --- a/java/res/xml-sw600dp/kbd_qwerty_row4.xml +++ b/java/res/xml-sw600dp/kbd_qwerty_row4.xml @@ -21,117 +21,225 @@ + + - - - + - + + + + + + + + latin:keyStyle="smileyKeyStyle" /> + latin:keyLabel="\@" /> + + + + latin:keyLabel="/" + latin:manualTemporaryUpperCaseCode="64" + latin:keyHintIcon="@drawable/key_hint_at_holo" + latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_at_large_holo" + latin:popupCharacters="\@" /> - - - - + + - + latin:keyStyle="comKeyStyle" + latin:keyWidth="17.8%p" /> - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/res/xml-sw600dp/kbd_settings.xml b/java/res/xml-sw600dp/kbd_settings.xml new file mode 100644 index 000000000..86dc1f7e7 --- /dev/null +++ b/java/res/xml-sw600dp/kbd_settings.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/res/xml-sw600dp/kbd_symbols.xml b/java/res/xml-sw600dp/kbd_symbols.xml index 3f79ae178..c89cd2fba 100644 --- a/java/res/xml-sw600dp/kbd_symbols.xml +++ b/java/res/xml-sw600dp/kbd_symbols.xml @@ -23,7 +23,6 @@ latin:keyboardHeight="@dimen/keyboardHeight" latin:maxKeyboardHeight="50%p" latin:rowHeight="25%p" - latin:keyWidth="10%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" latin:popupKeyboardTemplate="@xml/kbd_popup_template" @@ -33,13 +32,13 @@ latin:keyboardLayout="@xml/kbd_key_styles" /> + + latin:popupCharacters="¹,½,⅓,¼,⅛" /> @@ -63,15 +62,19 @@ latin:keyLabel="9" /> + - + + - + latin:keyLabel="#" /> + - + - - + latin:keyLabel="<" + latin:popupCharacters="≤,«,‹" /> + latin:keyLabel=">" + latin:popupCharacters="≥,»,›" /> - + latin:keyLabel="=" + latin:popupCharacters="≠,≈" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + latin:keyLabel="\@" /> + latin:keyStyle="spaceKeyStyle" + latin:keyWidth="38.5%p" /> + + + + + + + + + + + + + - diff --git a/java/res/xml-sw600dp/kbd_symbols_shift.xml b/java/res/xml-sw600dp/kbd_symbols_shift.xml index 97fbc1ec7..7195f6a7e 100644 --- a/java/res/xml-sw600dp/kbd_symbols_shift.xml +++ b/java/res/xml-sw600dp/kbd_symbols_shift.xml @@ -23,7 +23,6 @@ latin:keyboardHeight="@dimen/keyboardHeight" latin:maxKeyboardHeight="50%p" latin:rowHeight="25%p" - latin:keyWidth="10%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" latin:popupKeyboardTemplate="@xml/kbd_popup_template" @@ -31,12 +30,12 @@ > + + latin:keyLabel="~" /> + latin:keyStyle="nonPasswordSymbolKeyStyle" + latin:keyLabel="§" + latin:popupCharacters="¶" /> + - - + + @@ -79,52 +85,80 @@ latin:keyLabel="€" /> + latin:keyLabel="¥" /> + latin:keyStyle="nonPasswordSymbolKeyStyle" + latin:keyLabel="°" + latin:popupCharacters="′,″" /> + latin:keyStyle="nonPasswordSymbolKeyStyle" + latin:keyLabel="±" + latin:popupCharacters="∞" /> + latin:keyLabel="{" /> + - + - + latin:keyLabel="\\" /> + latin:keyLabel="®" /> + latin:keyStyle="nonPasswordSymbolKeyStyle" + latin:keyLabel="™" /> + latin:keyStyle="nonPasswordSymbolKeyStyle" + latin:keyLabel="℅" /> + latin:keyLabel="[" /> + + + - + + + + + + + +