nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge change 24211 into eclair 

* changes:
  Adjust the size of bottom row of keys for email mode. Fix for 2099889
main
Android (Google) Code Review 2009-09-09 06:19:01 -07:00
parent b50a1a3c91 d9688c77a9
commit 64e245f60b
6 changed files with 44 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
res/values/strings.xml
View File

@ -191,4 +191,15 @@
<!-- appears above image showing how to access keyboard settings -->
<string name="keyboard_settings"><font size="17"><b>Keyboard settings\n</b></font><font size="3">\n</font>Touch \u0026 hold the <b>\?123\</b> key.</string>
<!-- popular web domains for the locale - most popular, displayed on the keyboard -->
<string name="popular_domain_0">".com"</string>
<!-- popular web domains for the locale - item 1, displayed in the popup -->
<string name="popular_domain_1">".net"</string>
<!-- popular web domains for the locale - item 2, displayed in the popup -->
<string name="popular_domain_2">".org"</string>
<!-- popular web domains for the locale - item 3, displayed in the popup -->
<string name="popular_domain_3">".gov"</string>
<!-- popular web domains for the locale - item 4, displayed in the popup -->
<string name="popular_domain_4">".edu"</string>
</resources>

8
res/xml-de/kbd_qwerty.xml
View File

@ -116,7 +116,8 @@
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="_"
android:keyWidth="20%p" android:keyEdgeFlags="left"/>
<Key android:keyLabel=".com" android:keyOutputText=".com"
<Key android:keyLabel="@string/popular_domain_0"
android:keyOutputText="@string/popular_domain_0"
android:popupKeyboard="@xml/popup_domains"
android:keyWidth="15%p"/>
<Key android:keyLabel="/" android:keyWidth="15%p"/>
@ -135,8 +136,11 @@
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="_"
android:keyWidth="20%p" android:keyEdgeFlags="left"/>
<Key android:keyLabel="," android:keyWidth="15%p" />
<Key android:keyLabel="\@" android:keyWidth="15%p"/>
<Key android:keyLabel="@string/popular_domain_0"
android:keyOutputText="@string/popular_domain_0"
android:popupKeyboard="@xml/popup_domains"
android:keyWidth="15%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="15%p" android:isRepeatable="true"/>

8
res/xml-fr/kbd_qwerty.xml
View File

@ -118,7 +118,8 @@
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters=""
android:keyWidth="20%p" android:keyEdgeFlags="left"/>
<Key android:keyLabel=".com" android:keyOutputText=".com"
<Key android:keyLabel="@string/popular_domain_0"
android:keyOutputText="@string/popular_domain_0"
android:popupKeyboard="@xml/popup_domains"
android:keyWidth="15%p"/>
<Key android:keyLabel="/" android:keyWidth="15%p"/>
@ -137,8 +138,11 @@
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters=""
android:keyWidth="20%p" android:keyEdgeFlags="left"/>
<Key android:keyLabel="," android:keyWidth="15%p" />
<Key android:keyLabel="\@" android:keyWidth="15%p"/>
<Key android:keyLabel="@string/popular_domain_0"
android:keyOutputText="@string/popular_domain_0"
android:popupKeyboard="@xml/popup_domains"
android:keyWidth="15%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="15%p" android:isRepeatable="true"/>

14
res/xml/kbd_qwerty.xml
View File

@ -127,7 +127,8 @@
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="_"
android:keyWidth="20%p" android:keyEdgeFlags="left"/>
<Key android:keyLabel=".com" android:keyOutputText=".com"
<Key android:keyLabel="@string/popular_domain_0"
android:keyOutputText="@string/popular_domain_0"
android:popupKeyboard="@xml/popup_domains"
android:keyWidth="15%p"/>
<Key android:keyLabel="/" android:keyWidth="15%p"/>
@ -146,13 +147,16 @@
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="_"
android:keyWidth="20%p" android:keyEdgeFlags="left"/>
<Key android:keyLabel="," android:keyWidth="10%p" />
<Key android:keyLabel="\@" android:keyWidth="20%p"/>
<Key android:keyLabel="\@" android:keyWidth="15%p"/>
<Key android:keyLabel="@string/popular_domain_0"
android:keyOutputText="@string/popular_domain_0"
android:popupKeyboard="@xml/popup_domains"
android:keyWidth="15%p"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="20%p" android:isRepeatable="true"/>
android:keyWidth="15%p" android:isRepeatable="true"/>
<Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
android:keyWidth="10%p"/>
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"/>

12
res/xml/popup_domains.xml
View File

@ -26,9 +26,13 @@
>
<Row android:rowEdgeFlags="top|bottom">
<Key android:keyLabel=".net" android:keyOutputText=".net" android:keyEdgeFlags="left" />
<Key android:keyLabel=".org" android:keyOutputText=".org"/>
<Key android:keyLabel=".gov" android:keyOutputText=".gov"/>
<Key android:keyLabel=".tv" android:keyOutputText=".tv" android:keyEdgeFlags="right" />
<Key android:keyLabel="@string/popular_domain_1"
android:keyOutputText="@string/popular_domain_1" android:keyEdgeFlags="left" />
<Key android:keyLabel="@string/popular_domain_2"
android:keyOutputText="@string/popular_domain_2"/>
<Key android:keyLabel="@string/popular_domain_3"
android:keyOutputText="@string/popular_domain_3"/>
<Key android:keyLabel="@string/popular_domain_4"
android:keyOutputText="@string/popular_domain_4" android:keyEdgeFlags="right" />
</Row>
</Keyboard>

4
src/com/android/inputmethod/latin/LatinIME.java
View File

@ -209,6 +209,10 @@ public class LatinIME extends InputMethodService
public void onConfigurationChanged(Configuration conf) {
if (!TextUtils.equals(conf.locale.toString(), mLocale)) {
initSuggest(conf.locale.toString());
if (mKeyboardSwitcher == null) {
mKeyboardSwitcher = new KeyboardSwitcher(this);
}
mKeyboardSwitcher.makeKeyboards();
}
// If orientation changed while predicting, commit the change
if (conf.orientation != mOrientation) {