From 37445e113688e6dc5571a5ae7fddf1d63f587862 Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Thu, 26 May 2011 21:14:17 +0900 Subject: [PATCH] Update phone/number layout with new 7inch design (DO NOT MERGE) Bug: 4442045 Change-Id: I346489b62b424f6fb897b109310b62b2538ef397 --- java/res/xml-sw600dp/kbd_number.xml | 170 ++++++++++++++------- java/res/xml-sw600dp/kbd_phone.xml | 108 +++++++++---- java/res/xml-sw600dp/kbd_phone_symbols.xml | 149 ++++++++++++------ java/res/xml-sw600dp/kbd_settings.xml | 17 ++- java/res/xml-sw768dp/kbd_phone.xml | 8 +- java/res/xml-sw768dp/kbd_phone_symbols.xml | 8 +- 6 files changed, 313 insertions(+), 147 deletions(-) diff --git a/java/res/xml-sw600dp/kbd_number.xml b/java/res/xml-sw600dp/kbd_number.xml index c8641ed3f..4af621d86 100644 --- a/java/res/xml-sw600dp/kbd_number.xml +++ b/java/res/xml-sw600dp/kbd_number.xml @@ -23,7 +23,7 @@ latin:keyboardHeight="@dimen/keyboardHeight" latin:maxKeyboardHeight="50%p" latin:rowHeight="25%p" - latin:keyWidth="26.67%p" + latin:keyWidth="13.7%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" latin:popupKeyboardTemplate="@xml/kbd_popup_template" @@ -37,116 +37,182 @@ - + + + + latin:keyStyle="num1KeyStyle" /> + latin:horizontalGap="20.3%p" /> + + + latin:keyStyle="num4KeyStyle" /> + latin:horizontalGap="14.8%p" /> + + + latin:keyStyle="num7KeyStyle" /> - + - + + + latin:horizontalGap="43.2%p" /> - + latin:horizontalGap="30.2%p" /> + + - + + + + latin:code="45" + latin:keyLabel="-" + latin:keyWidth="9.1%p" /> + + + + + + + + + + + latin:keyWidth="13.7%p" /> + + + + + + + - + - + + + + + latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle" + latin:keyWidth="27.2%p" /> + + - + latin:keyLabel="#" /> + + diff --git a/java/res/xml-sw600dp/kbd_phone.xml b/java/res/xml-sw600dp/kbd_phone.xml index 8dd1ab760..f77fc7e43 100644 --- a/java/res/xml-sw600dp/kbd_phone.xml +++ b/java/res/xml-sw600dp/kbd_phone.xml @@ -23,7 +23,7 @@ latin:keyboardHeight="@dimen/keyboardHeight" latin:maxKeyboardHeight="50%p" latin:rowHeight="25%p" - latin:keyWidth="26.67%p" + latin:keyWidth="13.7%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" latin:popupKeyboardTemplate="@xml/kbd_popup_template" @@ -33,62 +33,110 @@ latin:keyboardLayout="@xml/kbd_key_styles" /> - + + + + latin:code="45" + latin:keyLabel=" - " + latin:keyWidth="9.1%p" /> + + + + + + latin:code="44" + latin:keyLabel=" , " + latin:keyWidth="9.1%p" /> + + + + + + + + + + + + + + + + - - + latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle" + latin:keyWidth="18.2%p" /> + + latin:keyStyle="numStarKeyStyle" + latin:keyWidth="13.7%p" /> + latin:keyStyle="num0KeyStyle" + latin:keyWidth="13.7%p" />> - + latin:keyStyle="numPoundKeyStyle" + latin:keyWidth="13.7%p" /> + + diff --git a/java/res/xml-sw600dp/kbd_phone_symbols.xml b/java/res/xml-sw600dp/kbd_phone_symbols.xml index d355c8eac..63ef4128f 100644 --- a/java/res/xml-sw600dp/kbd_phone_symbols.xml +++ b/java/res/xml-sw600dp/kbd_phone_symbols.xml @@ -23,7 +23,7 @@ latin:keyboardHeight="@dimen/keyboardHeight" latin:maxKeyboardHeight="50%p" latin:rowHeight="25%p" - latin:keyWidth="26.67%p" + latin:keyWidth="13.7%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" latin:popupKeyboardTemplate="@xml/kbd_popup_template" @@ -33,68 +33,117 @@ latin:keyboardLayout="@xml/kbd_key_styles" /> - - - - - - + + - + latin:code="45" + latin:keyLabel=" - " + latin:keyWidth="9.1%p" /> + + latin:keyLabel="@string/label_pause_key" + latin:keyWidth="9.1%p" /> + + latin:keyStyle="num1KeyStyle" /> + + + + + + + + + + + + + + + - + + latin:code="40" + latin:keyLabel=" ( " + latin:keyWidth="9.1%p" /> + + + + + + + + + + + + + + + + - - - - - - - + + diff --git a/java/res/xml-sw600dp/kbd_settings.xml b/java/res/xml-sw600dp/kbd_settings.xml index 86dc1f7e7..331e1510e 100644 --- a/java/res/xml-sw600dp/kbd_settings.xml +++ b/java/res/xml-sw600dp/kbd_settings.xml @@ -32,16 +32,17 @@ > + latin:keyWidth="6.4%p" /> + latin:keyWidth="6.5%p" /> + latin:keyStyle="webTabKeyStyle" + latin:keyWidth="8.9%p" /> @@ -53,10 +54,10 @@ > + latin:keyWidth="6.4%p" /> + latin:keyWidth="6.5%p" /> + latin:keyStyle="settingsKeyStyle" + latin:keyWidth="8.9%p" /> + latin:keyStyle="micKeyStyle" + latin:keyWidth="8.9%p" /> - @@ -120,12 +120,12 @@ latin:keyStyle="num8KeyStyle" /> - - @@ -160,7 +160,7 @@ latin:keyWidth="8.042%p" /> - diff --git a/java/res/xml-sw768dp/kbd_phone_symbols.xml b/java/res/xml-sw768dp/kbd_phone_symbols.xml index 055c14867..f73fb5dc8 100644 --- a/java/res/xml-sw768dp/kbd_phone_symbols.xml +++ b/java/res/xml-sw768dp/kbd_phone_symbols.xml @@ -108,7 +108,7 @@ - @@ -132,12 +132,12 @@ latin:keyStyle="num8KeyStyle" /> - - @@ -172,7 +172,7 @@ latin:keyWidth="8.042%p" /> -