From 673aed42c3b291fc9f81ead58ca35a5d150f4dce Mon Sep 17 00:00:00 2001
From: satok <satok@google.com>
Date: Mon, 30 Aug 2010 18:38:36 +0900
Subject: [PATCH] Add settings button
- delete unused keyboard layout
Change-Id: Iab39446653460797f1ca876a7d9a23190c3a8df6
---
.../sym_keyboard_feedback_settings.png | Bin 0 -> 729 bytes
.../drawable-hdpi/sym_keyboard_settings.png | Bin 0 -> 1459 bytes
.../sym_keyboard_feedback_settings.png | Bin 0 -> 729 bytes
java/res/drawable/sym_keyboard_settings.png | Bin 0 -> 1459 bytes
java/res/values/keycodes.xml | 1 +
java/res/xml/kbd_alpha.xml | 106 ------------------
java/res/xml/kbd_alpha_black.xml | 106 ------------------
java/res/xml/kbd_qwerty.xml | 58 +++++-----
java/res/xml/kbd_qwerty_black.xml | 62 +++++-----
java/res/xml/kbd_symbols.xml | 9 +-
java/res/xml/kbd_symbols_black.xml | 9 +-
java/res/xml/kbd_symbols_shift.xml | 9 +-
java/res/xml/kbd_symbols_shift_black.xml | 9 +-
.../inputmethod/latin/KeyboardSwitcher.java | 17 +--
14 files changed, 93 insertions(+), 293 deletions(-)
create mode 100644 java/res/drawable-hdpi/sym_keyboard_feedback_settings.png
create mode 100644 java/res/drawable-hdpi/sym_keyboard_settings.png
create mode 100644 java/res/drawable/sym_keyboard_feedback_settings.png
create mode 100644 java/res/drawable/sym_keyboard_settings.png
delete mode 100644 java/res/xml/kbd_alpha.xml
delete mode 100644 java/res/xml/kbd_alpha_black.xml
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png b/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..08ba18f28db90ae647f03e5ee4111cc29a2ebb27
GIT binary patch
literal 729
zcmV;~0w(>5P)<h;3K|Lk000e1NJLTq001Na001)x1^@s6|I@0w0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!dr3q=RCwC#nEyw^K^VvPDI&%gF~*39
z=%+D8l!y@{A|m=JBKj#xL_|dNPxN!Y#1dmEqF=@+OO$1lW|SCF)^mBvb=^Jpe72=8
z?s#*3x_j<*_j$hDXI{Nt5B#R)IUon*fE<tm`b$8b=lux8Cx-t3)B#F?(x5nK53~eo
z2VH>9K*yjX)QcaWw?E#+Y%5}#Bmpr4T2-D4MYt#Q!N3GcfV#1t)-0^kJt!t^qQ6x@
zQ=l5C4BEoJy100r(L5Jp_oe<=vp|!KlPI8HML|`|*e4y7AD~0a0%F&F()ek{1}2*U
z61#pTjL&K2>=NTI@ict{2`3JN)(wV>pg|%nEP@^lb2mV<7#u91Ao{|y;dF$Pb~2(_
zL|BP9tqaUuR-h@uNKt`_;*PTjDo(UZ`hOf9*<>%p0oo=E3`>ipFxRMK#OaPm<K_u_
z8yuj5VRBwtBw`8iJM=-(LWbNWl;Z$Zsoh}PWQ6y+G(JQ4(I<vBjWdP~PI|6Hp{>QG
z{<UGum$h_258rUZFjf3^4p7A~xm)TVF(6K)eve_y16|nY_gz$u`iAhI5<0WZsWTj>
zUbE#5Yy)@$(3J<-#}){CYaF12W#_UZhVZVF!5X%VnO=TXkA%Ghx0dAzBZthJ;GpHT
zp86@Sqm~>~!V=S=0SV%3da~G<&;e1G{2Woy-`g!lTm?fojD8lh%sT)L`Mu;vu>{mx
ztTNhe=z^AH9K9dabXnf-B|m9#POffDC8v?kpcwj8qcB<ZH8l$qkiN+ZK0pdeGPMFV
z`fc9}8pkLMV*(Tf^a>+RMA43NL-+?jHn<<G9FPNYKn^Gncokp(#{GXcK*=_w00000
LNkvXXu0mjf;Tu7v
literal 0
HcmV?d00001
diff --git a/java/res/drawable-hdpi/sym_keyboard_settings.png b/java/res/drawable-hdpi/sym_keyboard_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3bcdbcaca5cdd8100b1649f349b2a3d1281edc3
GIT binary patch
literal 1459
zcmV;k1x)&hP)<h;3K|Lk000e1NJLTq001Na001)x1^@s6|I@0w0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU%RY^oaRCwC#Sbs>IWgOrAn0jihbLydm
zce*t<D~p)4S<4@VPF;olVUPm}B8(h}1pc962AYxd!vuo}#1x&F6qYbu<{#mILFimu
zbIt^_S$a-APj`9O=Of<(Ip6m^ZyAhnU-<C8yzlcq&*%C6ejlCJ>pgHci7rGaL?}ck
zBq6!WMRy0^7=ZhLNWcWF18czj@@x}u$@6t@fT+>wbpMG^A`k;a3rs?02{;6p{RsgM
zaQb7v32|XPaKvmjKU!T~eJVRUJHu+VCQVFCT*=GJYciQk@pE%?ZGS?pLB__$uC}za
z{Ni%CuHd@`(Uvn1p+FJ_qyQ&@CxGmMfr0P5J7jTj@$dHb_OAv92fz3FNoHo|oA~B&
zeg`}WBy&z$(FcFgYmkW$GPa6}igS=Gj-Q;IoZdMoCMM=^Sy|cnf`Wp=ozFKnH#efA
zqm48(Ht{yb<O?Aiv=Sby;~oT#1JAX!wSDP!yKmoujE;`}$a{ZH@VVV?|JDCF$HIDc
z-+gm)b1UY|1&#s6V5)=#$ZTzG{lXhS;4<^@t5@MuZ>>YL#{L5lQl}V|!I+HUYc47(
zdR~h)=66?BRej=cIA)=x$<EHsi<<cY5)ly*F6+W_I>TN}<#XcG+_lH!*;3naS65fJ
zn7{^{0M1^8sEuEOP@5R{jA-eY<TX`EVno1+-%U?Xe|>0Z=#tXJ3kwT>A@tv;j{%Pe
zAuI3{7wqrv{{~LIsr2pe@bKl1j*hOTrluB*KLb3d72=QCY_>A`0yU$g9Xe@3Lc)2O
zjHw_8V1yOOJ;OW)x#`04^0GrsTTB<oU9ZT76kUfIIFnJOHVHK&WT@^Onv^@9nwnxR
zv{R!Q85wU#-g&mXy!;(Hvf6z0_4OZ7t5S+~$wNTi&k(f<YHDge5Y1$BvW<-mm;V@Q
zx2~@4Lm`#h-Q9grZ9Z;Bv}#czbOd;TVXXA={QUeJ-_uOYz*-^hbUN4QgEU`iYU*oB
zxr;JAJ$+rwZBrt|MEJ7WLOXVoJ2EozL!kUb^U3%ErKIWeBfNhJcvvY9G5id0G?NnB
z+1XiY=r#*&a&mG?p!|U`HYq=DEWD&xu}!8(-?~bKwg}dseeSuuh*po%3%y>i)5_G_
zgkXQCVk4B8XpzLZj)?j#5DP@!4e5)*EEY?=(ij8<H}4Vb604TI8S;4lA{~_uyRx#f
zs^&k;KXm3mPR+F>e_53@#ND{y`M)c%jf;zmMW{2B4~>tHU&DP1NUivfLtS&!*4BQC
z#TY>`4Gj(Fj7H-@r8#9SmtdE$B|XWqp|x`f=hHwIch826J7o>~7Q#%=q{#Qh#l=->
zC4|DYq;5v5nSMJLG3TgFaswirAQw%S1W2`?B?*=vrUuqJEwkQ)hzlIm^2G$;>Bh#!
zkF|0PHN_Gml{;UGEL)X)YN)TT?`y4+K|#O$xm5i`ttQ_fS~?2*eikU-tgf!E&CJYP
zrzQ}>dbF%jFyo0Zh}L&d@^nf{$_3og&)5>XwZ_N$dLfno?>-A#Va_dn7{AwKw%r$1
zR#v_jNcF)8!(SYkzLpeBPi+*_<&u<^bM93*hmgsYuGA3hQBb&$%3`y{%6z9}*e{8h
zvV=^S+JD(zG?gUwE@a!O)}E;Skw_C(C{10G@ApTI&|d#z>3k2!)m&0il3H3?dL}I`
z?KmoSRBUYQVbss<CLV#Xil0e)PfyQJy}iA5CU1Z_=N2o_ejYX$gixfMbofp?4APGu
zkoIIt4jEPiyuS%Dp8w<Y!zWQfMvIVBt|7U{kMu$Z=OIG(8lis$7y!*3!$QDFB(VSh
N002ovPDHLkV1g)qzwH13
literal 0
HcmV?d00001
diff --git a/java/res/drawable/sym_keyboard_feedback_settings.png b/java/res/drawable/sym_keyboard_feedback_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..08ba18f28db90ae647f03e5ee4111cc29a2ebb27
GIT binary patch
literal 729
zcmV;~0w(>5P)<h;3K|Lk000e1NJLTq001Na001)x1^@s6|I@0w0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!dr3q=RCwC#nEyw^K^VvPDI&%gF~*39
z=%+D8l!y@{A|m=JBKj#xL_|dNPxN!Y#1dmEqF=@+OO$1lW|SCF)^mBvb=^Jpe72=8
z?s#*3x_j<*_j$hDXI{Nt5B#R)IUon*fE<tm`b$8b=lux8Cx-t3)B#F?(x5nK53~eo
z2VH>9K*yjX)QcaWw?E#+Y%5}#Bmpr4T2-D4MYt#Q!N3GcfV#1t)-0^kJt!t^qQ6x@
zQ=l5C4BEoJy100r(L5Jp_oe<=vp|!KlPI8HML|`|*e4y7AD~0a0%F&F()ek{1}2*U
z61#pTjL&K2>=NTI@ict{2`3JN)(wV>pg|%nEP@^lb2mV<7#u91Ao{|y;dF$Pb~2(_
zL|BP9tqaUuR-h@uNKt`_;*PTjDo(UZ`hOf9*<>%p0oo=E3`>ipFxRMK#OaPm<K_u_
z8yuj5VRBwtBw`8iJM=-(LWbNWl;Z$Zsoh}PWQ6y+G(JQ4(I<vBjWdP~PI|6Hp{>QG
z{<UGum$h_258rUZFjf3^4p7A~xm)TVF(6K)eve_y16|nY_gz$u`iAhI5<0WZsWTj>
zUbE#5Yy)@$(3J<-#}){CYaF12W#_UZhVZVF!5X%VnO=TXkA%Ghx0dAzBZthJ;GpHT
zp86@Sqm~>~!V=S=0SV%3da~G<&;e1G{2Woy-`g!lTm?fojD8lh%sT)L`Mu;vu>{mx
ztTNhe=z^AH9K9dabXnf-B|m9#POffDC8v?kpcwj8qcB<ZH8l$qkiN+ZK0pdeGPMFV
z`fc9}8pkLMV*(Tf^a>+RMA43NL-+?jHn<<G9FPNYKn^Gncokp(#{GXcK*=_w00000
LNkvXXu0mjf;Tu7v
literal 0
HcmV?d00001
diff --git a/java/res/drawable/sym_keyboard_settings.png b/java/res/drawable/sym_keyboard_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3bcdbcaca5cdd8100b1649f349b2a3d1281edc3
GIT binary patch
literal 1459
zcmV;k1x)&hP)<h;3K|Lk000e1NJLTq001Na001)x1^@s6|I@0w0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU%RY^oaRCwC#Sbs>IWgOrAn0jihbLydm
zce*t<D~p)4S<4@VPF;olVUPm}B8(h}1pc962AYxd!vuo}#1x&F6qYbu<{#mILFimu
zbIt^_S$a-APj`9O=Of<(Ip6m^ZyAhnU-<C8yzlcq&*%C6ejlCJ>pgHci7rGaL?}ck
zBq6!WMRy0^7=ZhLNWcWF18czj@@x}u$@6t@fT+>wbpMG^A`k;a3rs?02{;6p{RsgM
zaQb7v32|XPaKvmjKU!T~eJVRUJHu+VCQVFCT*=GJYciQk@pE%?ZGS?pLB__$uC}za
z{Ni%CuHd@`(Uvn1p+FJ_qyQ&@CxGmMfr0P5J7jTj@$dHb_OAv92fz3FNoHo|oA~B&
zeg`}WBy&z$(FcFgYmkW$GPa6}igS=Gj-Q;IoZdMoCMM=^Sy|cnf`Wp=ozFKnH#efA
zqm48(Ht{yb<O?Aiv=Sby;~oT#1JAX!wSDP!yKmoujE;`}$a{ZH@VVV?|JDCF$HIDc
z-+gm)b1UY|1&#s6V5)=#$ZTzG{lXhS;4<^@t5@MuZ>>YL#{L5lQl}V|!I+HUYc47(
zdR~h)=66?BRej=cIA)=x$<EHsi<<cY5)ly*F6+W_I>TN}<#XcG+_lH!*;3naS65fJ
zn7{^{0M1^8sEuEOP@5R{jA-eY<TX`EVno1+-%U?Xe|>0Z=#tXJ3kwT>A@tv;j{%Pe
zAuI3{7wqrv{{~LIsr2pe@bKl1j*hOTrluB*KLb3d72=QCY_>A`0yU$g9Xe@3Lc)2O
zjHw_8V1yOOJ;OW)x#`04^0GrsTTB<oU9ZT76kUfIIFnJOHVHK&WT@^Onv^@9nwnxR
zv{R!Q85wU#-g&mXy!;(Hvf6z0_4OZ7t5S+~$wNTi&k(f<YHDge5Y1$BvW<-mm;V@Q
zx2~@4Lm`#h-Q9grZ9Z;Bv}#czbOd;TVXXA={QUeJ-_uOYz*-^hbUN4QgEU`iYU*oB
zxr;JAJ$+rwZBrt|MEJ7WLOXVoJ2EozL!kUb^U3%ErKIWeBfNhJcvvY9G5id0G?NnB
z+1XiY=r#*&a&mG?p!|U`HYq=DEWD&xu}!8(-?~bKwg}dseeSuuh*po%3%y>i)5_G_
zgkXQCVk4B8XpzLZj)?j#5DP@!4e5)*EEY?=(ij8<H}4Vb604TI8S;4lA{~_uyRx#f
zs^&k;KXm3mPR+F>e_53@#ND{y`M)c%jf;zmMW{2B4~>tHU&DP1NUivfLtS&!*4BQC
z#TY>`4Gj(Fj7H-@r8#9SmtdE$B|XWqp|x`f=hHwIch826J7o>~7Q#%=q{#Qh#l=->
zC4|DYq;5v5nSMJLG3TgFaswirAQw%S1W2`?B?*=vrUuqJEwkQ)hzlIm^2G$;>Bh#!
zkF|0PHN_Gml{;UGEL)X)YN)TT?`y4+K|#O$xm5i`ttQ_fS~?2*eikU-tgf!E&CJYP
zrzQ}>dbF%jFyo0Zh}L&d@^nf{$_3og&)5>XwZ_N$dLfno?>-A#Va_dn7{AwKw%r$1
zR#v_jNcF)8!(SYkzLpeBPi+*_<&u<^bM93*hmgsYuGA3hQBb&$%3`y{%6z9}*e{8h
zvV=^S+JD(zG?gUwE@a!O)}E;Skw_C(C{10G@ApTI&|d#z>3k2!)m&0il3H3?dL}I`
z?KmoSRBUYQVbss<CLV#Xil0e)PfyQJy}iA5CU1Z_=N2o_ejYX$gixfMbofp?4APGu
zkoIIt4jEPiyuS%Dp8w<Y!zWQfMvIVBt|7U{kMu$Z=OIG(8lis$7y!*3!$QDFB(VSh
N002ovPDHLkV1g)qzwH13
literal 0
HcmV?d00001
diff --git a/java/res/values/keycodes.xml b/java/res/values/keycodes.xml
index 8156c0e07..3f03dd665 100644
--- a/java/res/values/keycodes.xml
+++ b/java/res/values/keycodes.xml
@@ -20,5 +20,6 @@
<resources>
<!-- Keycode for F1 (function) key. This one switches between language switch & comma/.com -->
+ <integer name="key_settings">-100</integer>
<integer name="key_f1">-103</integer>
</resources>
diff --git a/java/res/xml/kbd_alpha.xml b/java/res/xml/kbd_alpha.xml
deleted file mode 100644
index 4e8af3399..000000000
--- a/java/res/xml/kbd_alpha.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, 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:android="http://schemas.android.com/apk/res/android"
- android:keyWidth="10%p"
- android:horizontalGap="0px"
- android:verticalGap="0px"
- android:keyHeight="@dimen/key_height"
- >
-
- <Row>
- <Key android:keyLabel="a"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_a"
- android:keyEdgeFlags="left" />
- <Key android:keyLabel="b" />
- <Key android:keyLabel="c"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_c" />
- <Key android:keyLabel="d" />
- <Key android:keyLabel="e"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_e" />
- <Key android:keyLabel="f" />
- <Key android:keyLabel="g" />
- <Key android:keyLabel="h" />
- <Key android:keyLabel="i"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_i" />
- <Key android:keyLabel="j" android:keyEdgeFlags="right" />
- </Row>
- <Row>
- <Key android:keyLabel="k" android:keyEdgeFlags="left" />
- <Key android:keyLabel="l" />
- <Key android:keyLabel="m" />
- <Key android:keyLabel="n"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_n" />
- <Key android:keyLabel="o"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_o" />
- <Key android:keyLabel="p" />
- <Key android:keyLabel="q" />
- <Key android:keyLabel="r" />
- <Key android:keyLabel="s"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_s" />
- <Key android:keyLabel="t" android:keyEdgeFlags="right" />
- </Row>
-
- <Row>
- <Key android:codes="-1" android:keyIcon="@drawable/sym_keyboard_shift"
- android:keyWidth="15%p" android:isModifier="true"
- android:iconPreview="@drawable/sym_keyboard_feedback_shift"
- android:isSticky="true" android:keyEdgeFlags="left"/>
- <Key android:keyLabel="u"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_u" />
- <Key android:keyLabel="v"/>
- <Key android:keyLabel="w"/>
- <Key android:keyLabel="x"/>
- <Key android:keyLabel="y"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_y"
- />
- <Key android:keyLabel="z"/>
- <Key android:keyLabel=","/>
- <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete"
- android:keyWidth="15%p" android:keyEdgeFlags="right"
- android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:isRepeatable="true"/>
- </Row>
-
- <Row android:rowEdgeFlags="bottom">
- <Key android:codes="-3" android:keyIcon="@drawable/sym_keyboard_done"
- android:iconPreview="@drawable/sym_keyboard_feedback_done"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="-2" android:keyLabel="123" android:keyWidth="15%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:codes="46" android:keyLabel="."
- android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="15%p"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
- </Row>
-</Keyboard>
\ No newline at end of file
diff --git a/java/res/xml/kbd_alpha_black.xml b/java/res/xml/kbd_alpha_black.xml
deleted file mode 100644
index 108e466b8..000000000
--- a/java/res/xml/kbd_alpha_black.xml
+++ /dev/null
@@ -1,106 +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.
-*/
--->
-
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
- android:keyWidth="10%p"
- android:horizontalGap="0px"
- android:verticalGap="0px"
- android:keyHeight="@dimen/key_height"
- >
-
- <Row>
- <Key android:keyLabel="a"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_a"
- android:keyEdgeFlags="left" />
- <Key android:keyLabel="b" />
- <Key android:keyLabel="c"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_c" />
- <Key android:keyLabel="d" />
- <Key android:keyLabel="e"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_e" />
- <Key android:keyLabel="f" />
- <Key android:keyLabel="g" />
- <Key android:keyLabel="h" />
- <Key android:keyLabel="i"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_i" />
- <Key android:keyLabel="j" android:keyEdgeFlags="right" />
- </Row>
- <Row>
- <Key android:keyLabel="k" android:keyEdgeFlags="left" />
- <Key android:keyLabel="l" />
- <Key android:keyLabel="m" />
- <Key android:keyLabel="n"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_n" />
- <Key android:keyLabel="o"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_o" />
- <Key android:keyLabel="p" />
- <Key android:keyLabel="q" />
- <Key android:keyLabel="r" />
- <Key android:keyLabel="s"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_s" />
- <Key android:keyLabel="t" android:keyEdgeFlags="right" />
- </Row>
-
- <Row>
- <Key android:codes="-1" android:keyIcon="@drawable/sym_bkeyboard_shift"
- android:keyWidth="15%p" android:isModifier="true"
- android:iconPreview="@drawable/sym_keyboard_feedback_shift"
- android:isSticky="true" android:keyEdgeFlags="left"/>
- <Key android:keyLabel="u"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_u" />
- <Key android:keyLabel="v"/>
- <Key android:keyLabel="w"/>
- <Key android:keyLabel="x"/>
- <Key android:keyLabel="y"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_y"
- />
- <Key android:keyLabel="z"/>
- <Key android:keyLabel=","/>
- <Key android:codes="-5" android:keyIcon="@drawable/sym_bkeyboard_delete"
- android:keyWidth="15%p" android:keyEdgeFlags="right"
- android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:isRepeatable="true"/>
- </Row>
-
- <Row android:rowEdgeFlags="bottom">
- <Key android:codes="-3" android:keyIcon="@drawable/sym_bkeyboard_done"
- android:iconPreview="@drawable/sym_keyboard_feedback_done"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="-2" android:keyLabel="123" android:keyWidth="15%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:codes="46" android:keyLabel="."
- android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="15%p"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
- </Row>
-</Keyboard>
diff --git a/java/res/xml/kbd_qwerty.xml b/java/res/xml/kbd_qwerty.xml
index b0450c6cd..59c61e4c8 100755
--- a/java/res/xml/kbd_qwerty.xml
+++ b/java/res/xml/kbd_qwerty.xml
@@ -111,74 +111,81 @@
<Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:keyLabel="/" android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <!--Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/-->
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:keyLabel="\@"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <!--Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/-->
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
<Key android:keyLabel=":-)" android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="10%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/>
@@ -187,12 +194,11 @@
android:keyWidth="20%p" android:isRepeatable="true"/>
<Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="20%p"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
+ android:keyWidth="15%p"/>
+ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="right"/>
</Row>
-
</Keyboard>
-
diff --git a/java/res/xml/kbd_qwerty_black.xml b/java/res/xml/kbd_qwerty_black.xml
index afea2f379..076359c95 100755
--- a/java/res/xml/kbd_qwerty_black.xml
+++ b/java/res/xml/kbd_qwerty_black.xml
@@ -110,75 +110,82 @@
</Row>
<Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="30%p" android:isRepeatable="true"/>
+ <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:keyLabel="/" android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <!--Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/-->
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:keyLabel="\@"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <!--Key android:keyLabel="@string/popular_domain_0"
- android:keyOutputText="@string/popular_domain_0"
- android:popupKeyboard="@xml/popup_domains"
- android:keyWidth="20%p"/-->
+ android:keyWidth="30%p" android:isRepeatable="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="40%p" android:isRepeatable="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="30%p" android:isRepeatable="true"/>
+ <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
<Key android:keyLabel=":-)" android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="25%p" android:keyEdgeFlags="right"/>
</Row>
<Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="10%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
android:iconPreview="@drawable/sym_keyboard_feedback_mic"
android:keyWidth="10%p"/>
@@ -187,11 +194,12 @@
android:keyWidth="20%p" android:isRepeatable="true"/>
<Key android:codes="9" android:keyIcon="@drawable/sym_bkeyboard_tab"
android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="20%p"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
+ android:keyWidth="15%p"/>
+ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="right"/>
</Row>
</Keyboard>
diff --git a/java/res/xml/kbd_symbols.xml b/java/res/xml/kbd_symbols.xml
index 77eb7d059..3f6b8ac85 100755
--- a/java/res/xml/kbd_symbols.xml
+++ b/java/res/xml/kbd_symbols.xml
@@ -123,16 +123,19 @@
<Row android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_alpha_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:codes="@integer/key_f1" android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:keyWidth="40%p"
+ android:keyWidth="30%p"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:isRepeatable="true"/>
<Key android:codes="46" android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:keyWidth="20%p" android:keyEdgeFlags="right"
+ <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:keyWidth="25%p" android:keyEdgeFlags="right"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
/>
</Row>
diff --git a/java/res/xml/kbd_symbols_black.xml b/java/res/xml/kbd_symbols_black.xml
index 5f8dfbeaa..7eae55481 100755
--- a/java/res/xml/kbd_symbols_black.xml
+++ b/java/res/xml/kbd_symbols_black.xml
@@ -123,16 +123,19 @@
<Row android:rowEdgeFlags="bottom">
<Key android:codes="-2" android:keyLabel="@string/label_alpha_key"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+ android:keyWidth="15%p" android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:codes="@integer/key_f1" android:keyWidth="10%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:keyWidth="40%p"
+ android:keyWidth="30%p"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:isRepeatable="true"/>
<Key android:codes="46" android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:keyWidth="20%p" android:keyEdgeFlags="right"
+ <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:keyWidth="25%p" android:keyEdgeFlags="right"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
/>
</Row>
diff --git a/java/res/xml/kbd_symbols_shift.xml b/java/res/xml/kbd_symbols_shift.xml
index 467ca529f..0ec4c713c 100755
--- a/java/res/xml/kbd_symbols_shift.xml
+++ b/java/res/xml/kbd_symbols_shift.xml
@@ -89,16 +89,19 @@
</Row>
<Row android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_alpha_key" android:keyWidth="20%p"
+ <Key android:codes="-2" android:keyLabel="@string/label_alpha_key" android:keyWidth="15%p"
android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:keyLabel="„" android:keyWidth="10%p" />
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:keyWidth="40%p"
+ android:keyWidth="30%p"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:isRepeatable="true"/>
<Key android:keyLabel="…" android:keyWidth="10%p" />
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"
+ android:keyWidth="25%p" android:keyEdgeFlags="right"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
/>
</Row>
diff --git a/java/res/xml/kbd_symbols_shift_black.xml b/java/res/xml/kbd_symbols_shift_black.xml
index 511ad4981..250e0854c 100755
--- a/java/res/xml/kbd_symbols_shift_black.xml
+++ b/java/res/xml/kbd_symbols_shift_black.xml
@@ -89,16 +89,19 @@
</Row>
<Row android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_alpha_key" android:keyWidth="20%p"
+ <Key android:codes="-2" android:keyLabel="@string/label_alpha_key" android:keyWidth="15%p"
android:keyEdgeFlags="left"/>
+ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"/>
<Key android:keyLabel="„" android:keyWidth="10%p" />
<Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:keyWidth="40%p"
+ android:keyWidth="30%p"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:isRepeatable="true"/>
<Key android:keyLabel="…" android:keyWidth="10%p" />
<Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"
+ android:keyWidth="25%p" android:keyEdgeFlags="right"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
/>
</Row>
diff --git a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
index 45a54b1aa..a50c5aa41 100644
--- a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
@@ -37,11 +37,7 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
public static final int MODE_EMAIL = 5;
public static final int MODE_IM = 6;
public static final int MODE_WEB = 7;
-
- public static final int MODE_TEXT_QWERTY = 0;
- public static final int MODE_TEXT_ALPHA = 1;
- public static final int MODE_TEXT_COUNT = 2;
-
+
public static final int KEYBOARDMODE_NORMAL = R.id.mode_normal;
public static final int KEYBOARDMODE_URL = R.id.mode_url;
public static final int KEYBOARDMODE_EMAIL = R.id.mode_email;
@@ -59,7 +55,6 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
private static final int CHAR_THEME_COLOR_BLACK = 1;
// Tables which contains resource ids for each character theme color
- private static final int[] KBD_ALPHA = new int[] {R.xml.kbd_alpha, R.xml.kbd_alpha_black};
private static final int[] KBD_PHONE = new int[] {R.xml.kbd_phone, R.xml.kbd_phone_black};
private static final int[] KBD_PHONE_SYMBOLS = new int[] {
R.xml.kbd_phone_symbols, R.xml.kbd_phone_symbols_black};
@@ -92,7 +87,6 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
private int mMode = MODE_NONE; /** One of the MODE_XXX values */
private int mImeOptions;
- private int mTextMode = MODE_TEXT_QWERTY;
private boolean mIsSymbols;
private boolean mHasVoice;
private boolean mVoiceOnPrimary;
@@ -291,11 +285,6 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
"getKeyboardId:" + mode + "," + imeOptions + "," + isSymbols);
/* fall through */
case MODE_TEXT:
- if (mTextMode == MODE_TEXT_ALPHA) {
- return new KeyboardId(
- KBD_ALPHA[charColorId], KEYBOARDMODE_NORMAL, true, hasVoice);
- }
- // Normally mTextMode should be MODE_TEXT_QWERTY.
return new KeyboardId(keyboardRowsResId, KEYBOARDMODE_NORMAL, true, hasVoice);
case MODE_SYMBOLS:
return new KeyboardId(KBD_SYMBOLS[charColorId], hasVoice);
@@ -320,10 +309,6 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
boolean isTextMode() {
return mMode == MODE_TEXT;
}
-
- int getTextModeCount() {
- return MODE_TEXT_COUNT;
- }
boolean isAlphabetMode() {
if (mCurrentId == null) {